summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoichiro IWAO <meta@vmeta.jp>2018-10-18 11:19:38 +0900
committerKoichiro IWAO <meta@vmeta.jp>2018-10-18 11:19:38 +0900
commita4b0aa9355d00300d882c764203a637c59e41ce5 (patch)
tree4282d17ecdf9e2108b544ee82803d1631572bd2d
parentc2ade7a1f7318527bd8cb5aedc4ed127c5546c94 (diff)
downloadxrdp-proprietary-a4b0aa9355d00300d882c764203a637c59e41ce5.tar.gz
xrdp-proprietary-a4b0aa9355d00300d882c764203a637c59e41ce5.zip
Remove x11rdp from config
as it is already deprecated. x11rdp is complicated to build and very few people using it actually. However, some people still select "X11rdp" session and get stuck despite not installing x11rdp. https://github.com/neutrinolabs/xrdp/issues/962#issuecomment-430545526 People who really want to use x11rdp should revert this commit.
-rw-r--r--sesman/sesman.ini.in7
-rw-r--r--xrdp/xrdp.ini.in10
2 files changed, 0 insertions, 17 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..d7c4cd2d 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@