[debian-edu-commits] debian-edu/pkg-team/ 146/159: don’t spew on the console

[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 f246ed9d5771b5ef0fb64953786f74f7cf7cd101
Author: mirabilos <tg at mirbsd.org>
Date:   Wed Sep 2 17:26:00 2015 +0200

    don’t spew on the console
---
 changelog                  |  3 ++-
 patches/series             |  1 +
 patches/shutup-daemon.diff | 31 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 74b3725..5f856ff 100644
--- a/changelog
+++ b/changelog
@@ -6,8 +6,9 @@ xrdp (0.9.0~git20150902-1~beta1) teckids; urgency=high
   * Document the /tmp/.xrdp/ issue and precreate it from sysvinit script
   * Fix permissions to connect to xorgxrdp server from xrdp daemon
   * Correct misspelling of “doesn’t”
+  * Don’t debug to stdout when starting the dæmons
 
- -- Thorsten Glaser <thorsten.glaser at teckids.org>  Wed, 02 Sep 2015 16:59:36 +0200
+ -- Thorsten Glaser <thorsten.glaser at teckids.org>  Wed, 02 Sep 2015 17:25:40 +0200
 
 xrdp (0.9.0~git20150901+dfsg-1~beta1) teckids; urgency=medium
 
diff --git a/patches/series b/patches/series
index b483053..5b870b7 100644
--- a/patches/series
+++ b/patches/series
@@ -6,3 +6,4 @@ misc-fixes.diff
 systemd.diff
 nxstack.diff
 fix_perms.diff
+shutup-daemon.diff
diff --git a/patches/shutup-daemon.diff b/patches/shutup-daemon.diff
new file mode 100644
index 0000000..73b71d3
--- /dev/null
+++ b/patches/shutup-daemon.diff
@@ -0,0 +1,31 @@
+# DP: don’t spit on the console when starting
+
+--- a/common/log.c
++++ b/common/log.c
+@@ -382,11 +382,6 @@ internal_config_read_logging(int file, s
+     /* try to create path if not exist */
+     g_create_path(lc->log_file);
+ 
+-    g_printf("logging configuration:\r\n");
+-    g_printf("\tLogFile:       %s\r\n", lc->log_file);
+-    g_printf("\tLogLevel:      %i\r\n", lc->log_level);
+-    g_printf("\tEnableSyslog:  %i\r\n", lc->enable_syslog);
+-    g_printf("\tSyslogLevel:   %i\r\n", lc->syslog_level);
+     return LOG_STARTUP_OK;
+ }
+ 
+--- a/sesman/sesman.c
++++ b/sesman/sesman.c
+@@ -161,6 +161,12 @@ main(int argc, char **argv)
+ 
+     if (1 == argc)
+     {
++	/* redirect stdout to logfile early, due to debug msgs */
++	if (g_file_exist("/var/log/xrdp-sesman.log")) {
++		g_file_close(1);
++		g_file_open("/var/log/xrdp-sesman.log");
++	}
++
+         /* no options on command line. normal startup */
+         g_printf("starting sesman...\n");
+         daemon = 1;

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