From d26cb83a4f9243d0293709cc6380753d356fe159 Mon Sep 17 00:00:00 2001
From: LawrenceK <github@lklyne.co.uk>
Date: Wed, 2 Jan 2013 14:02:53 +0000
Subject: [PATCH 1/3] Make this the osirium default xrdp file

---
 xrdp/xrdp.ini | 59 +++------------------------------------------------
 1 file changed, 3 insertions(+), 56 deletions(-)

diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini
index 6ee1d9c3..c0852518 100644
--- a/xrdp/xrdp.ini
+++ b/xrdp/xrdp.ini
@@ -2,6 +2,7 @@
 [globals]
 bitmap_cache=yes
 bitmap_compression=yes
+address = 127.0.0.1
 port=3389
 crypt_level=low
 channel_code=1
@@ -26,17 +27,13 @@ tcp_keepalive=yes
 #hidelogwindow=yes
 
 [Logging]
-LogFile=xrdp.log
+LogFile=/opt/xrdp/var/log/xrdp.log
 LogLevel=DEBUG
 EnableSyslog=1
 SyslogLevel=DEBUG
 # LogLevel and SysLogLevel could by any of: core, error, warning, info or debug
 
 [channels]
-# Channel names not listed here will be blocket by XRDP.
-# You can block any channel by setting its value to false.
-# IMPORTANT! All channels are not supported in all use
-# cases even if you set all values to true.
 rdpdr=true
 rdpsnd=true
 drdynvc=true
@@ -44,57 +41,7 @@ cliprdr=true
 rail=true
 xrdpvr=true
 
-[xrdp1]
-name=sesman-X11rdp
-lib=libxup.so
-username=ask
-password=ask
-ip=127.0.0.1
-port=-1
-xserverbpp=24
-
-[xrdp2]
-name=sesman-Xvnc
-lib=libvnc.so
-username=ask
-password=ask
-ip=127.0.0.1
-port=-1
-
-[xrdp3]
-name=console
-lib=libvnc.so
-ip=127.0.0.1
-port=5900
-username=na
-password=ask
-
-[xrdp4]
-name=vnc-any
-lib=libvnc.so
-ip=ask
-port=ask5900
-username=na
-password=ask
-#pamusername=asksame
-#pampassword=asksame
-#pamsessionmng=127.0.0.1
-
-[xrdp5]
-name=sesman-any
-lib=libvnc.so
-ip=ask
-port=-1
-username=ask
-password=ask
-
-[xrdp6]
-name=rdp-any
-lib=librdp.so
-ip=ask
-port=ask3389
-
-[xrdp7]
+[freerdp1]
 name=freerdp-any
 lib=libxrdpfreerdp1.so
 ip=ask

From 36cf7532fa8712bd1235d1f99a0c1331ae151c3f Mon Sep 17 00:00:00 2001
From: LawrenceK <github@lklyne.co.uk>
Date: Wed, 16 Jan 2013 13:22:20 +0000
Subject: [PATCH 2/3] Keep osirium master the same as freerdp master Revert
 "Make this the osirium default xrdp file"

This reverts commit d26cb83a4f9243d0293709cc6380753d356fe159.
---
 xrdp/xrdp.ini | 59 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 3 deletions(-)

diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini
index e4960f1f..f500f63f 100644
--- a/xrdp/xrdp.ini
+++ b/xrdp/xrdp.ini
@@ -2,7 +2,6 @@
 [globals]
 bitmap_cache=yes
 bitmap_compression=yes
-address = 127.0.0.1
 port=3389
 crypt_level=low
 channel_code=1
@@ -28,13 +27,17 @@ tcp_keepalive=yes
 #bulk_compression=yes
 
 [Logging]
-LogFile=/opt/xrdp/var/log/xrdp.log
+LogFile=xrdp.log
 LogLevel=DEBUG
 EnableSyslog=1
 SyslogLevel=DEBUG
 # LogLevel and SysLogLevel could by any of: core, error, warning, info or debug
 
 [channels]
+# Channel names not listed here will be blocket by XRDP.
+# You can block any channel by setting its value to false.
+# IMPORTANT! All channels are not supported in all use
+# cases even if you set all values to true.
 rdpdr=true
 rdpsnd=true
 drdynvc=true
@@ -42,7 +45,57 @@ cliprdr=true
 rail=true
 xrdpvr=true
 
-[freerdp1]
+[xrdp1]
+name=sesman-X11rdp
+lib=libxup.so
+username=ask
+password=ask
+ip=127.0.0.1
+port=-1
+xserverbpp=24
+
+[xrdp2]
+name=sesman-Xvnc
+lib=libvnc.so
+username=ask
+password=ask
+ip=127.0.0.1
+port=-1
+
+[xrdp3]
+name=console
+lib=libvnc.so
+ip=127.0.0.1
+port=5900
+username=na
+password=ask
+
+[xrdp4]
+name=vnc-any
+lib=libvnc.so
+ip=ask
+port=ask5900
+username=na
+password=ask
+#pamusername=asksame
+#pampassword=asksame
+#pamsessionmng=127.0.0.1
+
+[xrdp5]
+name=sesman-any
+lib=libvnc.so
+ip=ask
+port=-1
+username=ask
+password=ask
+
+[xrdp6]
+name=rdp-any
+lib=librdp.so
+ip=ask
+port=ask3389
+
+[xrdp7]
 name=freerdp-any
 lib=libxrdpfreerdp1.so
 ip=ask

From c9e934c320d9d7895329ce6cdc526f36e2a1ce67 Mon Sep 17 00:00:00 2001
From: LawrenceK <github@lklyne.co.uk>
Date: Wed, 16 Jan 2013 14:06:57 +0000
Subject: [PATCH 3/3] bug in find_name_in_lists

---
 xrdp/xrdp_mm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c
index 9b0de186..fc00678f 100644
--- a/xrdp/xrdp_mm.c
+++ b/xrdp/xrdp_mm.c
@@ -2010,7 +2010,7 @@ find_name_in_lists(char *inName, struct list *names)
     for (index = 0; index < names->count; index++)
     {
         name = (char *)list_get_item(names, index);
-        if ( (name != 0) && g_strncmp(name, inName, MAX_CHANNEL_NAME))
+        if ( (name != 0) && (g_strncmp(name, inName, MAX_CHANNEL_NAME) == 0) )
         {
             reply = index;
             break; /* stop loop - item found*/