[debian-edu-commits] debian-edu/pkg-team/ 154/159: really make xrdp dæmon shut up on start…

[Dominik George]

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

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

commit 71d308e3ed62f47072e721c0126c73042dc92333
Author: mirabilos <tg at mirbsd.org>
Date:   Wed Sep 2 19:52:29 2015 +0200

    really make xrdp dæmon shut up on start…
---
 changelog                  |  6 ++++++
 patches/shutup-daemon.diff | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/changelog b/changelog
index 3c96163..c327573 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+xrdp (0.9.0~git20150902-1~beta2) teckids; urgency=low
+
+  * Really make xrdp dæmon shut up on start…
+
+ -- Thorsten Glaser <thorsten.glaser at teckids.org>  Wed, 02 Sep 2015 19:52:01 +0200
+
 xrdp (0.9.0~git20150902-1~beta1) teckids; urgency=high
 
   * New upstream snapshot, DFSG-free AFAICT TTBOMK
diff --git a/patches/shutup-daemon.diff b/patches/shutup-daemon.diff
index 73b71d3..9386f20 100644
--- a/patches/shutup-daemon.diff
+++ b/patches/shutup-daemon.diff
@@ -29,3 +29,13 @@
          /* no options on command line. normal startup */
          g_printf("starting sesman...\n");
          daemon = 1;
+--- a/xrdp/xrdp.c
++++ b/xrdp/xrdp.c
+@@ -516,7 +516,6 @@ main(int argc, char **argv)
+ 
+         if (0 != pid)
+         {
+-            g_writeln("process %d started ok", pid);
+             /* exit, this is the main process */
+             g_deinit();
+             g_exit(0);

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