diff options
| author | Pavel Roskin <plroskin@gmail.com> | 2016-12-14 11:35:22 -0800 |
|---|---|---|
| committer | Pavel Roskin <plroskin@gmail.com> | 2016-12-17 16:14:44 -0800 |
| commit | 65be965ebdfcb9db643bd557fa1557693eee25c3 (patch) | |
| tree | 85d86e5ee577ba6022131545bd9e987290d73102 | |
| parent | 9584e22ba63afd4793ea47c71299406e595e6dbb (diff) | |
| download | xrdp-proprietary-65be965ebdfcb9db643bd557fa1557693eee25c3.tar.gz xrdp-proprietary-65be965ebdfcb9db643bd557fa1557693eee25c3.zip | |
Set autorun to empty, improve autorun documentation
Setting autorun to empty keeps X11rdp as the default backend for
autologin (since it's the first section), but it also enables the backend
selection by the domain name.
Describe the autorun interaction with the domain name both in the config
file and in the manual.
| -rw-r--r-- | docs/man/xrdp.ini.5 | 10 | ||||
| -rw-r--r-- | xrdp/xrdp.ini | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/docs/man/xrdp.ini.5 b/docs/man/xrdp.ini.5 index 6a4da78c..0e13d405 100644 --- a/docs/man/xrdp.ini.5 +++ b/docs/man/xrdp.ini.5 @@ -29,9 +29,13 @@ Specify xrdp listening address. If not specified, defaults to 0.0.0.0 (all inter .TP \fBautorun\fP=\fIsession_name\fP -Automatically run the connection specified by \fIsession_name\fP, which must match a section as described below. -By default a drop-down list with all available connections is shown. -A connection can also be chosen by the connecting client by setting the \fBLOGIN DOMAIN\fP to a valid \fIsession name\fP. +Section name for automatic login. If set and the client supplies valid +username and password, the user will be logged in automatically using the +connection specified by \fIsession_name\fP. + +If \fIsession_name\fP is empty, the \fBLOGIN DOMAIN\fR from the client +with be used to select the section. If no domain name is supplied, the +first suitable section will be used for automatic login. .TP \fBbitmap_cache\fR=\fI[true|false]\fR 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 |