X-Git-Url: https://git.tld-linux.org/?p=packages%2Fxrdp.git;a=blobdiff_plain;f=config.patch;h=9a8ff29c59c7c346d0194952b715f910fae723c9;hp=bc42605b4c6b8f1b8ac6bf3cbebbca722c67b7fc;hb=HEAD;hpb=242b5728c78c9f6846cce9de4af1d2fe32479bcd

diff --git a/config.patch b/config.patch
index bc42605..02c2704 100644
--- a/config.patch
+++ b/config.patch
@@ -1,64 +1,151 @@
-diff -ur xrdp-v0.6.1.orig/sesman/sesman.ini xrdp-v0.6.1/sesman/sesman.ini
---- xrdp-v0.6.1.orig/sesman/sesman.ini	2013-11-09 20:11:15.000000000 +0000
-+++ xrdp-v0.6.1/sesman/sesman.ini	2014-11-26 19:19:47.000000000 +0000
-@@ -2,14 +2,14 @@
- ListenAddress=127.0.0.1
- ListenPort=3350
- EnableUserWindowManager=1
--UserWindowManager=startwm.sh
--DefaultWindowManager=startwm.sh
-+UserWindowManager=/etc/X11/xinit/Xclients
-+DefaultWindowManager=/etc/X11/xinit/Xclients
+diff -ur xrdp-0.9.19.orig/sesman/sesman.ini xrdp-0.9.19/sesman/sesman.ini
+--- xrdp-0.9.19.orig/sesman/sesman.ini	2022-03-17 07:21:20.000000000 +0100
++++ xrdp-0.9.19/sesman/sesman.ini	2022-04-01 00:52:52.926266171 +0200
+@@ -12,13 +12,13 @@
+ ReconnectScript=reconnectwm.sh
  
  [Security]
- AllowRootLogin=1
+-AllowRootLogin=true
++AllowRootLogin=false
  MaxLoginRetry=4
 -TerminalServerUsers=tsusers
 -TerminalServerAdmins=tsadmins
-+TerminalServerUsers=users
++TerminalServerUsers=xrdp
 +TerminalServerAdmins=root
+ ; When AlwaysGroupCheck=false access will be permitted
+ ; if the group TerminalServerUsers is not defined.
+-AlwaysGroupCheck=false
++AlwaysGroupCheck=true
+ ; When RestrictOutboundClipboard=all clipboard from the
+ ; server is not pushed to the client.
+ ; In addition, you can control text/file/image transfer restrictions
+@@ -80,13 +80,13 @@
  
- [Sessions]
- X11DisplayOffset=10
-@@ -19,22 +19,22 @@
- DisconnectedTimeLimit=0
+ [Logging]
+ ; Note: Log levels can be any of: core, error, warning, info, debug, or trace
+-LogFile=xrdp-sesman.log
++LogFile=/dev/null
+ LogLevel=INFO
+ EnableSyslog=true
+-#SyslogLevel=INFO
+-#EnableConsole=false
+-#ConsoleLevel=INFO
+-#EnableProcessId=false
++SyslogLevel=INFO
++EnableConsole=false
++ConsoleLevel=INFO
++EnableProcessId=false
+ 
+ [LoggingPerLogger]
+ ; Note: per logger configuration is only used if xrdp is built with
+@@ -117,8 +117,8 @@
+ param=-noreset
+ param=-nolisten
+ param=tcp
+-param=-logfile
+-param=.xorgxrdp.%s.log
++#param=-logfile
++#param=.xorgxrdp.%s.log
+ 
+ [Xvnc]
+ param=Xvnc
+diff -ur xrdp-0.9.19.orig/xrdp/xrdp.ini xrdp-0.9.19/xrdp/xrdp.ini
+--- xrdp-0.9.19.orig/xrdp/xrdp.ini	2022-03-17 07:16:35.000000000 +0100
++++ xrdp-0.9.19/xrdp/xrdp.ini	2022-04-01 00:53:37.547367844 +0200
+@@ -5,6 +5,9 @@
+ ; fork a new process for each incoming connection
+ fork=true
+ 
++; IP address to listen
++#address=127.0.0.1
++
+ ; ports to listen on, number alone means listen on all interfaces
+ ; 0.0.0.0 or :: if ipv6 is configured
+ ; space between multiple occurrences
+@@ -178,13 +181,13 @@
  
  [Logging]
--LogFile=/var/log/xrdp-sesman.log
--LogLevel=DEBUG
--EnableSyslog=0
--SyslogLevel=DEBUG
+ ; Note: Log levels can be any of: core, error, warning, info, debug, or trace
+-LogFile=xrdp.log
 +LogFile=/dev/null
-+LogLevel=INFO
-+EnableSyslog=1
+ LogLevel=INFO
+ EnableSyslog=true
+-#SyslogLevel=INFO
+-#EnableConsole=false
+-#ConsoleLevel=INFO
+-#EnableProcessId=false
 +SyslogLevel=INFO
++EnableConsole=false
++ConsoleLevel=INFO
++EnableProcessId=false
  
- [X11rdp]
- param1=-bs
- param2=-ac
--param3=-nolisten
--param4=tcp
-+#param3=-nolisten
-+#param4=tcp
+ [LoggingPerLogger]
+ ; Note: per logger configuration is only used if xrdp is built with
+@@ -218,14 +221,15 @@
+ ; Some session types such as Xorg, X11rdp and Xvnc start a display server.
+ ; Startup command-line parameters for the display server are configured
+ ; in sesman.ini. See and configure also sesman.ini.
+-[Xorg]
+-name=Xorg
+-lib=libxup.so
+-username=ask
+-password=ask
+-ip=127.0.0.1
+-port=-1
+-code=20
++
++#[Xorg]
++#name=Xorg
++#lib=libxup.so
++#username=ask
++#password=ask
++#ip=127.0.0.1
++#port=-1
++#code=20
  
  [Xvnc]
- param1=-bs
- param2=-ac
--param3=-nolisten
--param4=tcp
--param5=-localhost
--param6=-dpi
--param7=96
-+#param3=-nolisten
-+#param4=tcp
-+#param5=-localhost
-+#param6=-dpi
-+#param7=96
-diff -ur xrdp-v0.6.1.orig/xrdp/xrdp.ini xrdp-v0.6.1/xrdp/xrdp.ini
---- xrdp-v0.6.1.orig/xrdp/xrdp.ini	2013-11-09 20:11:15.000000000 +0000
-+++ xrdp-v0.6.1/xrdp/xrdp.ini	2014-11-26 21:16:09.982000000 +0000
-@@ -1,4 +1,3 @@
--
- [globals]
- bitmap_cache=yes
- bitmap_compression=yes
+ name=Xvnc
+@@ -247,13 +251,13 @@
+ ; Generic VNC Proxy
+ ; Tailor this to specific hosts and VNC instances by specifying an ip
+ ; and port and setting a suitable name.
+-[vnc-any]
+-name=vnc-any
+-lib=libvnc.so
+-ip=ask
+-port=ask5900
+-username=na
+-password=ask
++#[vnc-any]
++#name=vnc-any
++#lib=libvnc.so
++#ip=ask
++#port=ask5900
++#username=na
++#password=ask
+ #pamusername=asksame
+ #pampassword=asksame
+ #pamsessionmng=127.0.0.1
+@@ -262,15 +266,15 @@
+ ; Generic RDP proxy using NeutrinoRDP
+ ; Tailor this to specific hosts by specifying an ip and port and setting
+ ; a suitable name.
+-[neutrinordp-any]
+-name=neutrinordp-any
++#[neutrinordp-any]
++#name=neutrinordp-any
+ ; To use this section, you should build xrdp with configure option
+ ; --enable-neutrinordp.
+-lib=libxrdpneutrinordp.so
+-ip=ask
+-port=ask3389
+-username=ask
+-password=ask
++#lib=libxrdpneutrinordp.so
++#ip=ask
++#port=ask3389
++#username=ask
++#password=ask
+ ; Uncomment the following lines to enable PAM authentication for proxy
+ ; connections.
+ #pamusername=ask