[pkg-remote-commits] [xrdp] 01/03: Further fixes to 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 eaf6c1f7e6e63a52ae4bc69a5b6b9630c1f5bf25
Author: Dominik George <nik at naturalnet.de>
Date:   Sun Jan 1 23:03:54 2017 +0100

    Further fixes to patch.
---
 debian/patches/cve-2013-1430.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/cve-2013-1430.patch b/debian/patches/cve-2013-1430.patch
index c7e1219..a4a67a8 100644
--- a/debian/patches/cve-2013-1430.patch
+++ b/debian/patches/cve-2013-1430.patch
@@ -111,7 +111,7 @@ From: Dominik George <nik at naturalnet.de>
 +{
 +  if (0 == guid)
 +  {
-+    log_message(LOG_LEVEL_WARNING, "[session:%d] set_guid: null guid", __LINE__);
++    log_message(s_log, LOG_LEVEL_WARNING, "[session:%d] set_guid: null guid", __LINE__);
 +    return 1;
 +  }
 +
@@ -438,16 +438,16 @@ From: Dominik George <nik at naturalnet.de>
 -          g_sprintf(passwd_file, "%s/.vnc/sesman_%s_passwd", pw_dir, username);
 +
 +          /* Try legacy name first, remove if found */
-+          g_sprintf(*passwd_file, "%s/.vnc/sesman_%s_passwd",
++          g_sprintf(passwd_file, "%s/.vnc/sesman_%s_passwd",
 +                    pw_dir, username);
-+          if (g_file_exist(*passwd_file))
++          if (g_file_exist(passwd_file))
 +          {
-+            log_message(LOG_LEVEL_WARNING, "Removing insecure "
-+                        "password file %s", *passwd_file);
-+            g_file_delete(*passwd_file);
++            log_message(&(g_cfg->log), LOG_LEVEL_WARNING, "Removing insecure "
++                        "password file %s", passwd_file);
++            g_file_delete(passwd_file);
 +          }
 +
-+          g_sprintf(*passwd_file, "%s/.vnc/sesman_%s_passwd:%d",
++          g_sprintf(passwd_file, "%s/.vnc/sesman_%s_passwd:%d",
 +                    pw_dir, username, display);
          }
          else

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