summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormetalefty <meta@vmeta.jp>2018-10-26 09:24:57 +0900
committerGitHub <noreply@github.com>2018-10-26 09:24:57 +0900
commit6365905aacc0f39a7280f3c32f6607d3ca1afd5a (patch)
treecd27ef741ff7ff2d0a4c0ba7c9b74e377fd887e6
parent6270956ff1ce19eeadb473351cefa6d4024a4fc2 (diff)
parent37c04a40d86201781a9b2413b28e0e22b81d51d0 (diff)
downloadxrdp-proprietary-6365905aacc0f39a7280f3c32f6607d3ca1afd5a.tar.gz
xrdp-proprietary-6365905aacc0f39a7280f3c32f6607d3ca1afd5a.zip
Merge pull request #1232 from metalefty/deprecate-x11rdp
Deprecate x11rdp and simplify session types
-rw-r--r--sesman/sesman.ini.in7
-rw-r--r--xrdp/xrdp.ini.in28
2 files changed, 0 insertions, 35 deletions
diff --git a/sesman/sesman.ini.in b/sesman/sesman.ini.in
index fb930f6b..9af7a100 100644
--- a/sesman/sesman.ini.in
+++ b/sesman/sesman.ini.in
@@ -90,13 +90,6 @@ param=tcp
param=-logfile
param=.xorgxrdp.%s.log
-[X11rdp]
-param=X11rdp
-param=-bs
-param=-nolisten
-param=tcp
-param=-uds
-
[Xvnc]
param=Xvnc
param=-bs
diff --git a/xrdp/xrdp.ini.in b/xrdp/xrdp.ini.in
index c73e271c..bba2624e 100644
--- a/xrdp/xrdp.ini.in
+++ b/xrdp/xrdp.ini.in
@@ -162,16 +162,6 @@ ip=127.0.0.1
port=-1
code=20
-[X11rdp]
-name=X11rdp
-lib=libxup.@lib_extension@
-username=ask
-password=ask
-ip=127.0.0.1
-port=-1
-xserverbpp=24
-code=10
-
[Xvnc]
name=Xvnc
lib=libvnc.@lib_extension@
@@ -182,15 +172,6 @@ port=-1
#xserverbpp=24
#delay_ms=2000
-[console]
-name=console
-lib=libvnc.@lib_extension@
-ip=127.0.0.1
-port=5900
-username=na
-password=ask
-#delay_ms=2000
-
[vnc-any]
name=vnc-any
lib=libvnc.@lib_extension@
@@ -203,15 +184,6 @@ password=ask
#pamsessionmng=127.0.0.1
#delay_ms=2000
-[sesman-any]
-name=sesman-any
-lib=libvnc.@lib_extension@
-ip=ask
-port=-1
-username=ask
-password=ask
-#delay_ms=2000
-
[neutrinordp-any]
name=neutrinordp-any
lib=libxrdpneutrinordp.@lib_extension@