xrdp-next/xrdp-0.9.2-xrdp-ini.patch

--- xrdp-0.9.2/xrdp/xrdp.ini.orig	2017-03-30 17:18:55.000000000 +1100
+++ xrdp-0.9.2/xrdp/xrdp.ini	2017-03-31 10:19:59.977547714 +1100
@@ -148,72 +148,72 @@
 ; Session types
 ;
 
-[Xorg]
-name=Xorg
-lib=libxup.so
+[Xvnc]
+name=Xvnc
+lib=libvnc.so
 username=ask
 password=ask
 ip=127.0.0.1
 port=-1
-code=20
+#xserverbpp=24
+#delay_ms=2000
 
-[X11rdp]
-name=X11rdp
+[Xorg]
+name=Xorg
 lib=libxup.so
 username=ask
 password=ask
 ip=127.0.0.1
 port=-1
-xserverbpp=24
-code=10
+code=20
 
-[Xvnc]
-name=Xvnc
-lib=libvnc.so
-username=ask
-password=ask
-ip=127.0.0.1
-port=-1
+#[X11rdp]
+#name=X11rdp
+#lib=libxup.so
+#username=ask
+#password=ask
+#ip=127.0.0.1
+#port=-1
 #xserverbpp=24
-#delay_ms=2000
-
-[console]
-name=console
-lib=libvnc.so
-ip=127.0.0.1
-port=5900
-username=na
-password=ask
-#delay_ms=2000
+#code=10
 
-[vnc-any]
-name=vnc-any
-lib=libvnc.so
-ip=ask
-port=ask5900
-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
 #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
Bump up to 0.9.2. 2017-03-31 00:37:08 +00:00			`--- xrdp-0.9.2/xrdp/xrdp.ini.orig 2017-03-30 17:18:55.000000000 +1100`
			`+++ xrdp-0.9.2/xrdp/xrdp.ini 2017-03-31 10:19:59.977547714 +1100`
			`@@ -148,72 +148,72 @@`
Move all xrdp.ini adjustments to a patch Replacements with sed may fail silently. Failure to apply a patch is never silent. Leave Xorg section uncommented in preparation for xorgxrdp packaging. 2016-12-26 09:26:36 +00:00			`; Session types`
			`;`

Bump up to 0.9.2. 2017-03-31 00:37:08 +00:00			`-[Xorg]`
			`-name=Xorg`
Move all xrdp.ini adjustments to a patch Replacements with sed may fail silently. Failure to apply a patch is never silent. Leave Xorg section uncommented in preparation for xorgxrdp packaging. 2016-12-26 09:26:36 +00:00			`-lib=libxup.so`
Require tigervnc-server-minimal again, make it default. Comment out references to X11rdp. 2017-03-14 04:35:35 +00:00			`+[Xvnc]`
			`+name=Xvnc`
			`+lib=libvnc.so`
			`username=ask`
			`password=ask`
			`ip=127.0.0.1`
			`port=-1`
Bump up to 0.9.2. 2017-03-31 00:37:08 +00:00			`-code=20`
Require tigervnc-server-minimal again, make it default. Comment out references to X11rdp. 2017-03-14 04:35:35 +00:00			`+#xserverbpp=24`
			`+#delay_ms=2000`

Bump up to 0.9.2. 2017-03-31 00:37:08 +00:00			`-[X11rdp]`
			`-name=X11rdp`
			`+[Xorg]`
			`+name=Xorg`
			`lib=libxup.so`
			`username=ask`
			`password=ask`
			`ip=127.0.0.1`
Require tigervnc-server-minimal again, make it default. Comment out references to X11rdp. 2017-03-14 04:35:35 +00:00			`port=-1`
Bump up to 0.9.2. 2017-03-31 00:37:08 +00:00			`-xserverbpp=24`
			`-code=10`
			`+code=20`
Require tigervnc-server-minimal again, make it default. Comment out references to X11rdp. 2017-03-14 04:35:35 +00:00
			`-[Xvnc]`
			`-name=Xvnc`
			`-lib=libvnc.so`
			`-username=ask`
			`-password=ask`
			`-ip=127.0.0.1`
			`-port=-1`
			`+#[X11rdp]`
			`+#name=X11rdp`
			`+#lib=libxup.so`
			`+#username=ask`
			`+#password=ask`
			`+#ip=127.0.0.1`
			`+#port=-1`
Use xorgxrdp by default - Make xrdp depend on xorgxrdp, not on tigervnc-server-minimal - Make Xorg backend default - Call /usr/libexec/Xorg directly to avoid permission checks 2017-03-09 23:51:11 +00:00			`#xserverbpp=24`
Require tigervnc-server-minimal again, make it default. Comment out references to X11rdp. 2017-03-14 04:35:35 +00:00			`-#delay_ms=2000`
Bump up to 0.9.2. 2017-03-31 00:37:08 +00:00			`-`
Use xorgxrdp by default - Make xrdp depend on xorgxrdp, not on tigervnc-server-minimal - Make Xorg backend default - Call /usr/libexec/Xorg directly to avoid permission checks 2017-03-09 23:51:11 +00:00			`-[console]`
			`-name=console`
Put Xvnc first, then Xorg and X11rdp, remove rdp-any Until xorgxrdp package is ready and is a dependency of xrdp, Xvnc should be first. Enable X11rdp, but put it to the end of the list. rdp-any is beyond repair and has been deleted in git, so don't leave it even commented out. 2017-01-24 07:34:41 +00:00			`-lib=libvnc.so`
Use xorgxrdp by default - Make xrdp depend on xorgxrdp, not on tigervnc-server-minimal - Make Xorg backend default - Call /usr/libexec/Xorg directly to avoid permission checks 2017-03-09 23:51:11 +00:00			`-ip=127.0.0.1`
			`-port=5900`
			`-username=na`
Require tigervnc-server-minimal again, make it default. Comment out references to X11rdp. 2017-03-14 04:35:35 +00:00			`-password=ask`
Bump up to 0.9.2. 2017-03-31 00:37:08 +00:00			`-#delay_ms=2000`
			`+#code=10`
Move all xrdp.ini adjustments to a patch Replacements with sed may fail silently. Failure to apply a patch is never silent. Leave Xorg section uncommented in preparation for xorgxrdp packaging. 2016-12-26 09:26:36 +00:00
			`-[vnc-any]`
			`-name=vnc-any`
			`-lib=libvnc.so`
			`-ip=ask`
			`-port=ask5900`
			`-username=na`
			`-password=ask`
Bump up to 0.9.2. 2017-03-31 00:37:08 +00:00			`+#[console]`
			`+#name=console`
			`+#lib=libvnc.so`
			`+#ip=127.0.0.1`
			`+#port=5900`
			`+#username=na`
			`+#password=ask`
			`+##delay_ms=2000`
			`+`
Move all xrdp.ini adjustments to a patch Replacements with sed may fail silently. Failure to apply a patch is never silent. Leave Xorg section uncommented in preparation for xorgxrdp packaging. 2016-12-26 09:26:36 +00:00			`+#[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`