[X2Go-Commits] [x2goserver] 14/15: x2goserver/bin/x2gostartagent: prevent logfile corruption.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goserver.

commit 16fad4232117be46a15b5b92c7cea80f6c7358bf
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Fri Mar 12 11:17:32 2021 +0100

    x2goserver/bin/x2gostartagent: prevent logfile corruption.
    
    Both stderr redirection and errors= in the options file wrote to the
    same file which lead to corruption with lots of debug output.
    
    Fixes: #1537.
---
 debian/changelog              | 3 +++
 x2goserver/bin/x2gostartagent | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7b79abcb..f8c6dde8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -448,6 +448,9 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
   * New upstream version (4.1.0.4):
     - x2goserver-x2goagent/etc/keystrokes.cfg: sync with nx-libs 3.5.99.20.
       Previous version was broken and incomplete. Fixes: #1388.
+    - x2goserver/bin/x2gostartagent: prevent logfile corruption. Both stderr
+      redirection and errors= in the options file wrote to the same file which
+      lead to corruption with lots of debug output. Fixes: #1537.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 19 Jul 2019 20:55:11 +0200
 
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 1c62b6ab..ee63ac18 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -417,7 +417,7 @@ if [[ -n "${X2GO_NXOPTIONS}" ]]; then
 	X2GO_NXOPTIONS="${X2GO_NXOPTIONS%,},"
 fi
 
-echo "nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=${X2GO_COOKIE},errors=${SESSION_LOG},kbtype=${kbtype_option},${option_geometry}xinerama=${xinerama_option},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT}${clipboard},client=linux,menu=0,${X2GO_NXOPTIONS}state=${STATE_FILE}:${X2GO_PORT}" >"${SESSION_DIR}/options"
+echo "nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=${X2GO_COOKIE},errors=${SESSION_LOG}_errors,kbtype=${kbtype_option},${option_geometry}xinerama=${xinerama_option},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT}${clipboard},client=linux,menu=0,${X2GO_NXOPTIONS}state=${STATE_FILE}:${X2GO_PORT}" >"${SESSION_DIR}/options"
 
 NX_AGENT=":${X2GO_PORT}"
 SAVED_DISPLAY="${DISPLAY}"

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git