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

diff --git a/config.patch b/config.patch
index bc42605..56af80c 100644
--- a/config.patch
+++ b/config.patch
@@ -1,64 +1,136 @@
-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.9.orig/sesman/sesman.ini xrdp-0.9.9/sesman/sesman.ini
+--- xrdp-0.9.9.orig/sesman/sesman.ini	2018-12-25 05:49:32.000000000 +0100
++++ xrdp-0.9.9/sesman/sesman.ini	2019-02-25 10:58:10.501000000 +0100
+@@ -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
  
  [Sessions]
- X11DisplayOffset=10
-@@ -19,22 +19,22 @@
- DisconnectedTimeLimit=0
+ ;; X11DisplayOffset - x11 display number offset
+@@ -61,10 +61,10 @@
+ Policy=Default
  
  [Logging]
--LogFile=/var/log/xrdp-sesman.log
+-LogFile=xrdp-sesman.log
 -LogLevel=DEBUG
--EnableSyslog=0
++LogFile=/dev/null
++LogLevel=INFO
+ EnableSyslog=1
 -SyslogLevel=DEBUG
++SyslogLevel=INFO
+ 
+ ;
+ ; Session definitions - startup command-line parameters for each session type
+@@ -87,8 +87,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.9.orig/xrdp/xrdp.ini xrdp-0.9.9/xrdp/xrdp.ini
+--- xrdp-0.9.9.orig/xrdp/xrdp.ini	2018-12-25 05:49:32.000000000 +0100
++++ xrdp-0.9.9/xrdp/xrdp.ini	2019-02-25 10:59:57.214000000 +0100
+@@ -4,6 +4,8 @@
+ 
+ ; fork a new process for each incoming connection
+ fork=true
++; IP address to listen
++;address=127.0.0.1
+ ; tcp port to listen
+ port=3389
+ ; 'port' above should be connected to with vsock instead of tcp
+@@ -118,10 +120,10 @@
+ ls_btn_cancel_height=30
+ 
+ [Logging]
+-LogFile=xrdp.log
+-LogLevel=DEBUG
 +LogFile=/dev/null
 +LogLevel=INFO
-+EnableSyslog=1
+ EnableSyslog=true
+-SyslogLevel=DEBUG
 +SyslogLevel=INFO
+ ; LogLevel and SysLogLevel could by any of: core, error, warning, info or debug
  
- [X11rdp]
- param1=-bs
- param2=-ac
--param3=-nolisten
--param4=tcp
-+#param3=-nolisten
-+#param4=tcp
+ [Channels]
+@@ -153,14 +155,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
+@@ -172,25 +175,25 @@
+ #xserverbpp=24
+ #delay_ms=2000
+ 
+-[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
+ #delay_ms=2000
+ 
+-[neutrinordp-any]
+-name=neutrinordp-any
+-lib=libxrdpneutrinordp.so
+-ip=ask
+-port=ask3389
+-username=ask
+-password=ask
++#[neutrinordp-any]
++#name=neutrinordp-any
++#lib=libxrdpneutrinordp.so
++#ip=ask
++#port=ask3389
++#username=ask
++#password=ask
+ 
+ ; You can override the common channel settings for each session type
+ #channel.rdpdr=true