summaryrefslogtreecommitdiffstats
path: root/xrdp
diff options
context:
space:
mode:
authorIdan Freiberg <speidy@gmail.com>2016-12-18 02:48:58 -0500
committerGitHub <noreply@github.com>2016-12-18 02:48:58 -0500
commit0f6d1aabc21432feb147cf7fdfe6369460608a9f (patch)
tree318fdfe366552b90e9cc37cf230f6616faf8604a /xrdp
parent637624995304b59e42655ee1b1c92654181c93a3 (diff)
parent65be965ebdfcb9db643bd557fa1557693eee25c3 (diff)
downloadxrdp-proprietary-0f6d1aabc21432feb147cf7fdfe6369460608a9f.tar.gz
xrdp-proprietary-0f6d1aabc21432feb147cf7fdfe6369460608a9f.zip
Merge pull request #548 from proski/autorun
Set autorun to empty, improve autorun documentation
Diffstat (limited to 'xrdp')
-rw-r--r--xrdp/xrdp.ini6
1 files changed, 4 insertions, 2 deletions
diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini
index 1da90cca..242641ff 100644
--- a/xrdp/xrdp.ini
+++ b/xrdp/xrdp.ini
@@ -31,8 +31,10 @@ key_file=
#tls_ciphers=HIGH
; Section name to use for automatic login if the client sends username
-; and password
-autorun=X11rdp
+; and password. If empty, the domain name sent by the client is used.
+; If empty and no domain name is given, the first suitable section in
+; this file will be used.
+autorun=
allow_channels=true
allow_multimon=true