Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug in kill disconnect sessions #175

Merged
merged 1 commit into from
Dec 18, 2020

Conversation

metalefty
Copy link
Member

Killing disconnected sessions should not happen if
XRDP_SESMAN_KILL_DISCONNECTED=0.

Fixes #174.

Signed-off-by: Koichiro IWAO meta@vmeta.jp

Killing disconnected sessions should not happen if
XRDP_SESMAN_KILL_DISCONNECTED=0.

Fixes neutrinolabs#174.

Signed-off-by: Koichiro IWAO <meta@vmeta.jp>
@metalefty metalefty requested a review from matt335672 December 17, 2020 06:33
if (i == 0)
{
dev->do_kill_disconnected = 0;
}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a little bit redundant but just to be sure.

Copy link
Member

@matt335672 matt335672 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all looks OK. but you might want to also change the wording in xrdp/docs/man.sesman.ini.5.in:-

       DisconnectedTimeLimit=number
              . . .
             You do not actually have to specify KillDisconnected if you set this value.

I think this is now wrong. Personally I think it's better the way you've now set it up.

@metalefty
Copy link
Member Author

Good catch. You did make the change for the man page to match actual behavior.
I think we should fix the behavior rather than the document. Thanks for the feedback!

@metalefty metalefty merged commit 01d3116 into neutrinolabs:devel Dec 18, 2020
@metalefty metalefty deleted the bug-kill-disconnected branch December 18, 2020 02:16
metalefty added a commit to metalefty/xrdp that referenced this pull request Dec 18, 2020
metalefty added a commit to neutrinolabs/xrdp that referenced this pull request Dec 19, 2020
clrpackages pushed a commit to clearlinux-pkgs/xrdp that referenced this pull request May 20, 2021
Alexandre Quesnel (37):
      Adding checks to prevent buffer overruns during data chunk re-assembly
      Enabling fuse for 32-bit CI builds
      Adding casts for narrowing to pointer width for issue #1678
      Adding a Travis CI build using the Ubuntu Focal
      Upgrading the OS for CI builds from Ubuntu 16.04 to 20.04
      Use a single type for the fuse file handle callback context
      Unifying logging in chanserv
      Fix SSL compiler warning
      Adding CI build using github actions
      Removing TravisCI builds
      Add caching of cppcheck to github action CI builds
      Migrating logging to LOG() and LOG_DEVEL() in sesman/*
      Migrating logging to LOG() and LOG_DEVEL() in libxrdp/*
      Fixing code formatting with astyle
      Changing LOG_DEVEL to LOG to avoid silent failures.
      Removing duplicate logging statements
      Fixing code location log level filtering
      Fixing TS_PLAY_SOUND_PDU_DATA to set the correct frequency and duration
      Migrating logging to LOG() and LOG_DEVEL() in xup/*
      Fixing formatting with astyle in xrdp/*
      Migrating logging to LOG() and LOG_DEVEL() in xrdp/*
      Removing logging from signal handler functions
      Fixing formatting with astyle in common/*
      Migrating logging to LOG() and LOG_DEVEL() in common/*
      Removing DEBUG() macro
      Fixing formatting with astyle in tests/*
      Adding self-contained tests to be built during `make all`
      Extracting bytes_to_hexdump function from logging implementation
      Remove duplicate implementation of os_call functions from tests/tcp_proxy
      Migrating logging to LOG() and LOG_DEVEL() in tests/*
      Moving gtcp_proxy and tcp_proxy to the tools/devel directory
      Fix spelling mistake in g_bytes_to_hexdump() doc
      Adding g_strnjoin() with units tests
      Add logging to g_exec*() functions
      Fix argument defaulting in install_xrdp_build_dependencies_with_apt.sh
      Adding logs to sesman/session.c
      Add -no-suppress to the libtool invocation for libcommon

Bolke de Bruin (3):
      Add support for token authentication
      Allow domain name to be concatenated to username
      Improve documentation

Christopher Pitstick (1):
      Resolution switching without reconnecting.

Clément BRUGUERA (1):
      Update README.md

D.V.Yacenko (1):
      Allow parameters for XRDP run bash script

Felix Zhang (1):
      genkeymap: Fix an array declaration conflict

Jay Sorg (1):
      build fix for older gcc

John Paul Adrian Glaubitz (4):
      Add support for m68k
      Add support for little-endian powerpc
      Add support for s390 and s390x
      Add support for sh

Khem Raj (2):
      correct the location of errno.h
      riscv doesn't require pointers to be aligned

Koichiro IWAO (20):
      man page fixes after neutrinolabs/xorgxrdp#175
      sesman: address the issue of socket file leftovers
      sesman: reflect review suggestions on cleanup_sockets
      Update NEWS for v0.9.15
      bump version to v0.9.15
      README: mention platform support tier
      do not install test & development tool
      rely on pkg-config when finding check
      Perform unit tests only if check is installed
      revise README
      Replace Travis badge with GitHub Actions
      add `--enable-tests` flag to ensure dependencies for the tests
      add missing CFLAGS to test_common
      `make distcheck` should only succeed if check is installed
      Demote some too verbose logs to TRACE level
      neutrinordp: avoid pampassword leakage
      neutrinolabs: do not log valid parameters as unknown
      Update NEWS for v0.9.16
      bump version to v0.9.16
      NEWS: set v0.9.16 release date

Matt Burt (1):
      Improve source_info commenting and fix neutrino slow link

Per Olav Kroka (1):
      Update xrdp_keyboard.ini for Norwegian keyboards

RisingWater (2):
      Update verify_user_pam.c
      Update verify_user_pam.c

Yifan J (1):
      startwm.sh: Additionally support /usr/etc/X11/xdm/Xsession in SUSE

aquesnel (6):
      Fix typo in sesman.ini man page
      Add detailed logging to libxrdp (#1742)
      Unify logging in mc/* (#1806)
      Unify logging in neutrinordp/* (#1807)
      Unify logging in xrdpapi/* (#1812)
      Unify logging in vnc/* (#1811)

matt335672 (29):
      Fixed compiler warnings about snprintf truncations
      Fix compilation warnings/errors in xrdp-neutrinordp.c
      chansrv improved config support
      Added -c / --config to xrdp
      Add log_config_init_for_console() for utilities
      Added --config/-c to sesman
      sesrun improvements and doc fixes
      Cosmetic fixes for minor issues
      Addressed review comments
      Allow FuseMountName for chansrv to be absolute path
      Moved a lot of string funcs to string_calls module
      Fix regressions in auth modules
      Bumped cppcheck version to 2.3
      Load any private key type, not just RSA (#1776)
      Remove output on stdout by default on daemon startuip
      Minor manpage fixes
      Added libxrdp_get_channel_count()
      Rename USE_NOPAM as USE_PAM
      Initial fix for WM states
      Bump FreeBSD version to 12.2
      Add versioning to xrdp_client_info
      Add OS_VERSION to cppcheck cache tag name
      Remove trailing spaces in actions file
      Remove openssl:i386
      Bumped cppcheck to v2.4
      Enable FUSE in cirrus build
      Allow DISPLAY=:0 for chansrv and in other modules
      Move get_display_num_from_display to string_calls module
      Add DISPLAY(n) ass a valid form of chansrvport

robertoetcheverryr (1):
      Updated man and .ini file regarding address:port parameters.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bug in kill disconnect sessions
2 participants