[pkg-remote-commits] [xrdp] 01/01: Add missing bits to backported patch.

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch jessie
in repository xrdp.

commit 76e3a6fb431bef036415607d29921f196881f5ec
Author: Dominik George <nik at naturalnet.de>
Date:   Sun Jan 1 20:56:41 2017 +0100

    Add missing bits to backported patch.
---
 debian/patches/cve-2013-1430.patch | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/debian/patches/cve-2013-1430.patch b/debian/patches/cve-2013-1430.patch
index 9ecd689..c7e1219 100644
--- a/debian/patches/cve-2013-1430.patch
+++ b/debian/patches/cve-2013-1430.patch
@@ -388,7 +388,36 @@ From: Dominik George <nik at naturalnet.de>
        {
          xrdp_mm_get_value(self, "ip", ip, 255);
          xrdp_wm_set_login_mode(self->wm, 10);
-@@ -987,7 +1000,7 @@ xrdp_mm_connect(struct xrdp_mm* self)
+@@ -915,11 +928,14 @@ xrdp_mm_connect(struct xrdp_mm* self)
+   char errstr[256];
+   char text[256];
+   char port[8];
++  tui8 guid[16];
++  tui8* pguid;
+ 
+   g_memset(ip,0,sizeof(char) * 256);
+   g_memset(errstr,0,sizeof(char) * 256);
+   g_memset(text,0,sizeof(char) * 256);
+   g_memset(port,0,sizeof(char) * 8);
++  g_memset(guid,0,sizeof(tui8) * 16);
+   rv = 0;
+   use_sesman = 0;
+   names = self->login_names;
+@@ -940,7 +956,13 @@ xrdp_mm_connect(struct xrdp_mm* self)
+         use_sesman = 1;
+       }
+     }
++    else if (g_strcasecmp(name, "guid") == 0)
++    {
++      g_memcpy(guid, value, 16);
++      pguid = guid;
++    }
+   }
++
+   if (use_sesman)
+   {
+     ok = 0;
+@@ -987,7 +1009,7 @@ xrdp_mm_connect(struct xrdp_mm* self)
    {
      if (xrdp_mm_setup_mod1(self) == 0)
      {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/xrdp.git