[debian-edu-commits] debian-edu/pkg-team/ 122/159: logfile madness

[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 0c85b1ee0103702da0ea8e81bf63c39e52d98b48
Author: mirabilos <tg at mirbsd.org>
Date:   Sun Aug 30 21:13:03 2015 +0000

    logfile madness
---
 README.Debian           |  3 +++
 changelog               |  3 ++-
 patches/config.diff     | 23 ++++++++++++++++++-----
 patches/misc-fixes.diff | 11 +++++++++++
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/README.Debian b/README.Debian
index cedbf49..f5ac888 100644
--- a/README.Debian
+++ b/README.Debian
@@ -30,3 +30,6 @@ Another security issue is the disablement of access control by default.
 Use at your own risk and inform your users that privacy is possibly not
 guaranteed as all users can attach to RDP users’ sessions locally.
 See also: https://github.com/neutrinolabs/xrdp/issues/264
+
+Furthermore, the package maintainers would like to know what the log
+messages about /etc/xrdp/cert.pem and /etc/xrdp/key.pem are good for.
diff --git a/changelog b/changelog
index 5a61dfb..537c938 100644
--- a/changelog
+++ b/changelog
@@ -3,8 +3,9 @@ xrdp (0.9.0~git20150830+dfsg-1~beta2) teckids; urgency=medium
   * Adjust Recommends and add Provides for xorgxrdp setup
   * Add sysvinit (file-rc, sysv-rc) LSB script (untested)
   * Create logfiles with correct permissions in postinst
+  * Add some debugging documentation and patches
 
- -- Thorsten Glaser <thorsten.glaser at teckids.org>  Sun, 30 Aug 2015 21:05:10 +0000
+ -- Thorsten Glaser <thorsten.glaser at teckids.org>  Sun, 30 Aug 2015 21:12:45 +0000
 
 xrdp (0.9.0~git20150830+dfsg-1~beta1) teckids; urgency=high
 
diff --git a/patches/config.diff b/patches/config.diff
index 3b766b6..fe5b191 100644
--- a/patches/config.diff
+++ b/patches/config.diff
@@ -1,12 +1,25 @@
 # DP: config patches for Debian
+# DP: move -logfile /dev/null to last, for easy commenting out
 
 --- a/sesman/sesman.ini
 +++ b/sesman/sesman.ini
-@@ -87,6 +87,7 @@ param5=-noreset
- param6=-ac
- param7=-nolisten
- param8=tcp
-+param9=-retro
+@@ -81,12 +81,13 @@ param7=96
+ [Xorg]
+ param1=-config
+ param2=xrdp/xorg.conf
+-param3=-logfile
+-param4=/dev/null
+-param5=-noreset
+-param6=-ac
+-param7=-nolisten
+-param8=tcp
++param3=-noreset
++param4=-ac
++param5=-nolisten
++param6=tcp
++param7=-retro
++param8=-logfile
++param9=/dev/null
  
  [Chansrv]
  # drive redirection, defaults to xrdp_client if not set
diff --git a/patches/misc-fixes.diff b/patches/misc-fixes.diff
index 9c6b3ce..681e065 100644
--- a/patches/misc-fixes.diff
+++ b/patches/misc-fixes.diff
@@ -82,6 +82,17 @@
  {
      LOG(0, ("rail_desktop_resize:"));
      return 0;
+--- a/sesman/session.c
++++ b/sesman/session.c
+@@ -652,7 +652,7 @@ session_start_fork(int width, int height
+                 else
+                 {
+                     log_message(LOG_LEVEL_ERROR, "another Xserver might "
+-                                "already be active on display %d - see log", display);
++                                "already be active on display %d - see log; possibly comment out the two param lines -logfile /dev/null in /etc/xrdp/sesman.ini to debug", display);
+                 }
+ 
+                 log_message(LOG_LEVEL_DEBUG, "aborting connection...");
 --- a/xorgxrdp/configure.ac
 +++ b/xorgxrdp/configure.ac
 @@ -9,7 +9,7 @@ AC_PROG_CC

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