Adjust xrdp.ini patch.

This commit is contained in:
Bojan Smojver 2021-09-01 13:10:03 +10:00
parent cdf759eb7e
commit 1f3af7fa44
2 changed files with 20 additions and 16 deletions

View File

@ -1,7 +1,7 @@
diff -ruN xrdp-0.9.16-v/xrdp/xrdp.ini xrdp-0.9.16/xrdp/xrdp.ini diff -ruN xrdp-0.9.17-v/xrdp/xrdp.ini xrdp-0.9.17/xrdp/xrdp.ini
--- xrdp-0.9.16-v/xrdp/xrdp.ini 2021-04-30 22:26:36.000000000 +1000 --- xrdp-0.9.17-v/xrdp/xrdp.ini 2021-09-01 11:32:12.000000000 +1000
+++ xrdp-0.9.16/xrdp/xrdp.ini 2021-05-01 09:31:16.664791933 +1000 +++ xrdp-0.9.17/xrdp/xrdp.ini 2021-09-01 13:06:55.525816406 +1000
@@ -190,14 +190,14 @@ @@ -203,14 +203,14 @@
; Some session types such as Xorg, X11rdp and Xvnc start a display server. ; Some session types such as Xorg, X11rdp and Xvnc start a display server.
; Startup command-line parameters for the display server are configured ; Startup command-line parameters for the display server are configured
; in sesman.ini. See and configure also sesman.ini. ; in sesman.ini. See and configure also sesman.ini.
@ -24,10 +24,10 @@ diff -ruN xrdp-0.9.16-v/xrdp/xrdp.ini xrdp-0.9.16/xrdp/xrdp.ini
[Xvnc] [Xvnc]
name=Xvnc name=Xvnc
@@ -216,25 +216,25 @@ @@ -232,13 +232,13 @@
; display number of the session ; Generic VNC Proxy
#chansrvport=DISPLAY(0) ; Tailor this to specific hosts and VNC instances by specifying an ip
; and port and setting a suitable name.
-[vnc-any] -[vnc-any]
-name=vnc-any -name=vnc-any
-lib=libvnc.so -lib=libvnc.so
@ -45,22 +45,26 @@ diff -ruN xrdp-0.9.16-v/xrdp/xrdp.ini xrdp-0.9.16/xrdp/xrdp.ini
#pamusername=asksame #pamusername=asksame
#pampassword=asksame #pampassword=asksame
#pamsessionmng=127.0.0.1 #pamsessionmng=127.0.0.1
#delay_ms=2000 @@ -247,15 +247,15 @@
; Generic RDP proxy using NeutrinoRDP
; Tailor this to specific hosts by specifying an ip and port and setting
; a suitable name.
-[neutrinordp-any] -[neutrinordp-any]
-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 -lib=libxrdpneutrinordp.so
-ip=ask -ip=ask
-port=ask3389 -port=ask3389
-username=ask -username=ask
-password=ask -password=ask
+#[neutrinordp-any]
+#name=neutrinordp-any
+#lib=libxrdpneutrinordp.so +#lib=libxrdpneutrinordp.so
+#ip=ask +#ip=ask
+#port=ask3389 +#port=ask3389
+#username=ask +#username=ask
+#password=ask +#password=ask
; Currently NeutrinoRDP doesn't support dynamic resizing. Uncomment ; Uncomment the following lines to enable PAM authentication for proxy
; this line if you're using a client which does. ; connections.
#enable_dynamic_resizing=false #pamusername=ask

View File

@ -25,7 +25,7 @@ Source5: README.Fedora
Source6: xrdp.te Source6: xrdp.te
Source7: xrdp-polkit-1.rules Source7: xrdp-polkit-1.rules
Patch0: xrdp-0.9.9-sesman.patch Patch0: xrdp-0.9.9-sesman.patch
Patch1: xrdp-0.9.16-xrdp-ini.patch Patch1: xrdp-0.9.17-xrdp-ini.patch
Patch2: xrdp-0.9.4-service.patch Patch2: xrdp-0.9.4-service.patch
Patch3: xrdp-0.9.10-scripts-libexec.patch Patch3: xrdp-0.9.10-scripts-libexec.patch
Patch4: xrdp-0.9.6-script-interpreter.patch Patch4: xrdp-0.9.6-script-interpreter.patch