From a4b0aa9355d00300d882c764203a637c59e41ce5 Mon Sep 17 00:00:00 2001
From: Koichiro IWAO <meta@vmeta.jp>
Date: Thu, 18 Oct 2018 11:19:38 +0900
Subject: [PATCH 1/3] 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.
---
 sesman/sesman.ini.in |  7 -------
 xrdp/xrdp.ini.in     | 10 ----------
 2 files changed, 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@

From f64e990ce8ea23eb65d6fded911ce05e41303747 Mon Sep 17 00:00:00 2001
From: Koichiro IWAO <meta@vmeta.jp>
Date: Thu, 18 Oct 2018 11:44:52 +0900
Subject: [PATCH 2/3] Remove sesman-any as it is not used at all

---
 xrdp/xrdp.ini.in | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/xrdp/xrdp.ini.in b/xrdp/xrdp.ini.in
index d7c4cd2d..bb34faed 100644
--- a/xrdp/xrdp.ini.in
+++ b/xrdp/xrdp.ini.in
@@ -193,15 +193,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@

From 37c04a40d86201781a9b2413b28e0e22b81d51d0 Mon Sep 17 00:00:00 2001
From: Koichiro IWAO <meta@vmeta.jp>
Date: Fri, 19 Oct 2018 10:52:12 +0900
Subject: [PATCH 3/3] Remove console session

it is VNC session to localhost:5900. Can be replaced with vnc-any.
---
 xrdp/xrdp.ini.in | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/xrdp/xrdp.ini.in b/xrdp/xrdp.ini.in
index bb34faed..bba2624e 100644
--- a/xrdp/xrdp.ini.in
+++ b/xrdp/xrdp.ini.in
@@ -172,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@