X-Git-Url: https://git.tld-linux.org/?p=packages%2Fxrdp.git;a=blobdiff_plain;f=config.patch;fp=config.patch;h=553344cdb740de1114be8a1212ee9d54a6b7a69b;hp=466577337a61f362377343f9a4484a896db3acf6;hb=bf524922b592ede951bacfb56ea09c3dca93b462;hpb=8c34e42728f06a58d10aa579028e27d6f5f7ea75

diff --git a/config.patch b/config.patch
index 4665773..553344c 100644
--- a/config.patch
+++ b/config.patch
@@ -1,56 +1,175 @@
-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 22:05:27.770000000 +0000
-@@ -8,8 +8,8 @@
+diff -ur xrdp-0.9.7.orig/sesman/sesman.ini xrdp-0.9.7/sesman/sesman.ini
+--- xrdp-0.9.7.orig/sesman/sesman.ini	2018-06-29 08:18:27.000000000 +0000
++++ xrdp-0.9.7/sesman/sesman.ini	2018-07-04 18:54:10.174090693 +0000
+@@ -14,11 +14,11 @@
  [Security]
- AllowRootLogin=1
+ AllowRootLogin=true
  MaxLoginRetry=4
 -TerminalServerUsers=tsusers
 -TerminalServerAdmins=tsadmins
 +TerminalServerUsers=users
 +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
+@@ -55,10 +55,10 @@
+ Policy=Default
  
  [Logging]
--LogFile=/var/log/xrdp-sesman.log
+-LogFile=xrdp-sesman.log
 -LogLevel=DEBUG
--EnableSyslog=0
--SyslogLevel=DEBUG
 +LogFile=/dev/null
 +LogLevel=INFO
-+EnableSyslog=1
+ EnableSyslog=1
+-SyslogLevel=DEBUG
 +SyslogLevel=INFO
  
+ ;
+ ; Session definitions - startup command-line parameters for each session type
+@@ -81,8 +81,8 @@
+ param=-noreset
+ param=-nolisten
+ param=tcp
+-param=-logfile
+-param=.xorgxrdp.%s.log
++#param=-logfile
++#param=.xorgxrdp.%s.log
+ 
  [X11rdp]
- param1=-bs
- param2=-ac
--param3=-nolisten
--param4=tcp
-+#param3=-nolisten
-+#param4=tcp
+ param=X11rdp
+diff -ur xrdp-0.9.7.orig/xrdp/xrdp.ini xrdp-0.9.7/xrdp/xrdp.ini
+--- xrdp-0.9.7.orig/xrdp/xrdp.ini	2018-06-29 08:18:27.000000000 +0000
++++ xrdp-0.9.7/xrdp/xrdp.ini	2018-07-04 18:55:55.985084386 +0000
+@@ -118,10 +118,10 @@
+ ls_btn_cancel_height=30
  
- [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 @@
+ [Logging]
+-LogFile=xrdp.log
+-LogLevel=DEBUG
++LogFile=/dev/null
++LogLevel=INFO
+ EnableSyslog=true
+-SyslogLevel=DEBUG
++SyslogLevel=INFO
+ ; LogLevel and SysLogLevel could by any of: core, error, warning, info or debug
+ 
+ [Channels]
+@@ -153,24 +153,24 @@
+ ; 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
 -
- [globals]
- bitmap_cache=yes
- bitmap_compression=yes
+-[X11rdp]
+-name=X11rdp
+-lib=libxup.so
+-username=ask
+-password=ask
+-ip=127.0.0.1
+-port=-1
+-xserverbpp=24
+-code=10
++#[Xorg]
++#name=Xorg
++#lib=libxup.so
++#username=ask
++#password=ask
++#ip=127.0.0.1
++#port=-1
++#code=20
++
++#[X11rdp]
++#name=X11rdp
++#lib=libxup.so
++#username=ask
++#password=ask
++#ip=127.0.0.1
++#port=-1
++#xserverbpp=24
++#code=10
+ 
+ [Xvnc]
+ name=Xvnc
+@@ -182,43 +182,43 @@
+ #xserverbpp=24
+ #delay_ms=2000
+ 
+-[console]
+-name=console
+-lib=libvnc.so
+-ip=127.0.0.1
+-port=5900
+-username=na
+-password=ask
++#[console]
++#name=console
++#lib=libvnc.so
++#ip=127.0.0.1
++#port=5900
++#username=na
++#password=ask
+ #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
+ 
+-[sesman-any]
+-name=sesman-any
+-lib=libvnc.so
+-ip=ask
+-port=-1
+-username=ask
+-password=ask
++#[sesman-any]
++#name=sesman-any
++#lib=libvnc.so
++#ip=ask
++#port=-1
++#username=ask
++#password=ask
+ #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