summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoichiro IWAO <meta@vmeta.jp>2018-10-16 16:53:33 +0900
committerKoichiro IWAO <meta@vmeta.jp>2018-10-16 16:53:33 +0900
commit5ea403430a5e531cf30af32c04f80a146e495dc3 (patch)
tree018971867dcefa76c969d27d0c48c9efb9692738
parentf84f3de478357216cade6c2099adbb4778bc0f24 (diff)
downloadxrdp-proprietary-5ea403430a5e531cf30af32c04f80a146e495dc3.tar.gz
xrdp-proprietary-5ea403430a5e531cf30af32c04f80a146e495dc3.zip
Sort & reword description of IdleTimeLimit
-rw-r--r--docs/man/sesman.ini.5.in13
-rw-r--r--sesman/sesman.ini.in13
2 files changed, 13 insertions, 13 deletions
diff --git a/docs/man/sesman.ini.5.in b/docs/man/sesman.ini.5.in
index 997fd1f3..2074985c 100644
--- a/docs/man/sesman.ini.5.in
+++ b/docs/man/sesman.ini.5.in
@@ -135,17 +135,18 @@ If set to \fB1\fR, \fBtrue\fR or \fByes\fR, every session will be killed
within 60 seconds after the user disconnects.
.TP
-\fBIdleTimeLimit\fR=\fInumber\fR
-\fI\This option is currently ignored!\fR Time limit before an idle
-session is disconnected. If set to \fI0\fR, automatic disconnection is
-disabled.
-
-.TP
\fBDisconnectedTimeLimit\fR=\fInumber\fR
Sets the time limit (in seconds) before a disconnected session is killed.
If set to \fI0\fR, automatic killing is disabled.
.TP
+\fBIdleTimeLimit\fR=\fInumber\fR
+Sets the time limit (in seconds) before an idle session is disconnected.
+Idle means no keyboard inputs and no mouse moves/clicks here.
+If set to \fI0\fR, idle sessions will never be disconnected by timeout.
+This works only with xorgxrdp session. Moreover, xorgxrdp must be v0.2.9 or later.
+
+.TP
\fBPolicy\fR=\fI[Default|UBD|UBI|UBC|UBDI|UBDC]\fR
Session allocation policy. By default, a new session is created
for the combination <User,BitPerPixel> when using Xrdp, and
diff --git a/sesman/sesman.ini.in b/sesman/sesman.ini.in
index deaf6f01..fb930f6b 100644
--- a/sesman/sesman.ini.in
+++ b/sesman/sesman.ini.in
@@ -37,13 +37,6 @@ MaxSessions=50
; if 1, true, or yes, kill session after 60 seconds
KillDisconnected=false
-;; IdleTimeLimit - when to disconnect idle sessions
-; Type: integer
-; Default: 0
-; if not zero, the seconds without mouse or keyboard input before disconnect
-; not complete yet
-IdleTimeLimit=0
-
;; DisconnectedTimeLimit - when to kill idle sessions
; Type: integer
; Default: 0
@@ -51,6 +44,12 @@ IdleTimeLimit=0
; min 60 seconds
DisconnectedTimeLimit=0
+;; IdleTimeLimit (specify in second) - wait before disconnect idle sessions
+; Type: integer
+; Default: 0
+; Set to 0 to disable idle disconnection.
+IdleTimeLimit=0
+
;; Policy - session allocation policy
; Type: enum [ "Default" | "UBD" | "UBI" | "UBC" | "UBDI" | "UBDC" ]
; Default: Xrdp:<User,BitPerPixel> and Xvnc:<User,BitPerPixel,DisplaySize>