[pkg-remote-commits] [xrdp] 01/01: review the patch (untested)

[Thorsten Glaser]

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

tg pushed a commit to branch master
in repository xrdp.

commit e1c8b63c7eec9448194c1f4d7b02194e0d217251
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Wed May 3 19:28:17 2017 +0200

    review the patch (untested)
---
 debian/patches/cve-2017-6967.diff | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/debian/patches/cve-2017-6967.diff b/debian/patches/cve-2017-6967.diff
index d26bfb7..7a944b0 100644
--- a/debian/patches/cve-2017-6967.diff
+++ b/debian/patches/cve-2017-6967.diff
@@ -91,7 +91,15 @@ Origin: https://github.com/neutrinolabs/xrdp/commit/4b8a33e087ee9cf5556b40b717cd
  
 --- a/sesman/session.c
 +++ b/sesman/session.c
-@@ -490,6 +490,7 @@ session_start_fork(tbus data, tui8 type,
+@@ -335,7 +335,6 @@ session_start_sessvc(int xpid, int wmpid
+     g_sigterm(xpid);
+     g_sigterm(wmpid);
+     g_sleep(1000);
+-    auth_end(data);
+     g_exit(0);
+ }
+ 
+@@ -490,6 +489,7 @@ session_start_fork(tbus data, tui8 type,
          return 0;
      }
  
@@ -99,7 +107,15 @@ Origin: https://github.com/neutrinolabs/xrdp/commit/4b8a33e087ee9cf5556b40b717cd
      pid = g_fork(); /* parent is fork from tcp accept,
                         child forks X and wm, then becomes scp */
  
-@@ -639,7 +640,6 @@ session_start_fork(tbus data, tui8 type,
+@@ -548,7 +548,6 @@ session_start_fork(tbus data, tui8 type,
+         else if (wmpid == 0)
+         {
+             wait_for_xserver(display);
+-            auth_start_session(data, display);
+             pampid = g_fork(); /* parent waits, todo
+                                   child becomes wm */
+             if (pampid == -1)
+@@ -639,7 +638,6 @@ session_start_fork(tbus data, tui8 type,
              else
              {
                  g_waitpid(pampid);
@@ -107,7 +123,7 @@ Origin: https://github.com/neutrinolabs/xrdp/commit/4b8a33e087ee9cf5556b40b717cd
                  g_deinit();
                  g_exit(0);
              }
-@@ -967,6 +967,8 @@ session_kill(int pid)
+@@ -967,6 +965,8 @@ session_kill(int pid)
  
          if (tmp->item->pid == pid)
          {

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