diff options
| author | metalefty <meta@vmeta.jp> | 2016-11-02 11:38:09 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-02 11:38:09 +0900 |
| commit | c6df12b558160b45a6005b051aba0ddd8e82ae0a (patch) | |
| tree | 69dfcbf2eb27c94cf9c0604f23149ecd8a73694b /xrdp | |
| parent | 0d1cf12677f75f04f4876007c8e47063d12aa06f (diff) | |
| parent | 61811466e2755ea75930f27216b4a0731edb06a5 (diff) | |
| download | xrdp-proprietary-c6df12b558160b45a6005b051aba0ddd8e82ae0a.tar.gz xrdp-proprietary-c6df12b558160b45a6005b051aba0ddd8e82ae0a.zip | |
Merge pull request #470 from proski/xorg-ini
Simplify names of xrdp.ini sections, rename "Session Manager" to "Xorg"
Diffstat (limited to 'xrdp')
| -rw-r--r-- | xrdp/xrdp.ini | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini index 6f9936c4..e5bc148b 100644 --- a/xrdp/xrdp.ini +++ b/xrdp/xrdp.ini @@ -56,7 +56,7 @@ grey=dedede # Section name to use for automatic login if the client sends username # and password -autorun=xrdp1 +autorun=X11rdp bulk_compression=yes @@ -144,8 +144,8 @@ tcutils=true # for debugging xrdp, add following line to section xrdp1 # chansrvport=/tmp/.xrdp/xrdp_chansrv_socket_7210 -[xrdp1] -name=sesman-X11rdp +[X11rdp] +name=X11rdp lib=libxup.so username=ask password=ask @@ -154,8 +154,18 @@ port=-1 xserverbpp=24 code=10 -[xrdp2] -name=sesman-Xvnc +[Xorg] +name=Xorg +lib=libxup.so +username=ask +password=ask +ip=127.0.0.1 +port=-1 +xserverbpp=24 +code=20 + +[Xvnc] +name=Xvnc lib=libvnc.so username=ask password=ask @@ -163,7 +173,7 @@ ip=127.0.0.1 port=-1 #delay_ms=2000 -[xrdp3] +[console] name=console lib=libvnc.so ip=127.0.0.1 @@ -172,7 +182,7 @@ username=na password=ask #delay_ms=2000 -[xrdp4] +[vnc-any] name=vnc-any lib=libvnc.so ip=ask @@ -184,7 +194,7 @@ password=ask #pamsessionmng=127.0.0.1 #delay_ms=2000 -[xrdp5] +[sesman-any] name=sesman-any lib=libvnc.so ip=ask @@ -193,13 +203,13 @@ username=ask password=ask #delay_ms=2000 -[xrdp6] +[rdp-any] name=rdp-any lib=librdp.so ip=ask port=ask3389 -[xrdp7] +[neutrinordp-any] name=neutrinordp-any lib=libxrdpneutrinordp.so ip=ask @@ -207,16 +217,6 @@ port=ask3389 username=ask password=ask -[Session manager] -name=Session manager -lib=libxup.so -username=ask -password=ask -ip=127.0.0.1 -port=-1 -xserverbpp=24 -code=20 - # You can override the common channel settings for each session type #channel.rdpdr=true #channel.rdpsnd=true |