blob: deaadde8c712b45b9a08f9bf534ead5b42b61ab4 [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -04001From a9c460f158d68c1b3de6a31ce853de5379977695 Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@cn.fujitsu.com>
3Date: Thu, 30 Nov 2017 11:10:04 +0900
4Subject: [PATCH] Fix sesman.ini and xrdp.ini
5
6Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
7---
8 sesman/sesman.ini | 20 ++++++--------------
9 xrdp/xrdp.ini | 10 ----------
10 2 files changed, 6 insertions(+), 24 deletions(-)
11
12diff --git a/sesman/sesman.ini b/sesman/sesman.ini
13index 8225ee4..c09189e 100644
14--- a/sesman/sesman.ini
15+++ b/sesman/sesman.ini
16@@ -54,12 +54,14 @@ LogLevel=DEBUG
17 EnableSyslog=1
18 SyslogLevel=DEBUG
19
20-[X11rdp]
21-param=X11rdp
22-param=-bs
23+[Xorg]
24+param=Xorg
25+param=-config
26+param=xrdp/xorg.conf
27+param=-noreset
28 param=-nolisten
29 param=tcp
30-param=-uds
31+
32
33 [Xvnc]
34 param=Xvnc
35@@ -70,16 +72,6 @@ param=-localhost
36 param=-dpi
37 param=96
38
39-[Xorg]
40-param=Xorg
41-param=-config
42-param=xrdp/xorg.conf
43-param=-noreset
44-param=-nolisten
45-param=tcp
46-param=-logfile
47-param=.xorgxrdp.%s.log
48-
49 [Chansrv]
50 ; drive redirection, defaults to xrdp_client if not set
51 FuseMountName=thinclient_drives
52diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini
53index cb6d7c3..9f63a69 100644
54--- a/xrdp/xrdp.ini
55+++ b/xrdp/xrdp.ini
56@@ -157,16 +157,6 @@ ip=127.0.0.1
57 port=-1
58 code=20
59
60-[X11rdp]
61-name=X11rdp
62-lib=libxup.so
63-username=ask
64-password=ask
65-ip=127.0.0.1
66-port=-1
67-xserverbpp=24
68-code=10
69-
70 [Xvnc]
71 name=Xvnc
72 lib=libvnc.so
73--
741.8.4.2
75