This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goserver.
commit 6471448dcf26876067f9f7c52f0a3f47c6de8078
Author: Mihai Moldovan <io...@ionic.de>
Date: Sat Aug 13 03:14:47 2016 +0200
x2goserver-xsession/etc/Xsession: fix uname calls when (potentially)
creating session log/error file and add uname call where necessary.
Cherry-picked from release/4.0.1.x branch.
---
debian/changelog | 2 ++
x2goserver-xsession/etc/Xsession | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e50ba19..aee1dc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -317,6 +317,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
-h, -? and --man options. Fixes: #1065. Also print a usage message on
unknown options.
- x2goserver/man/man8/x2gocleansessions.8: drop obsolete man page.
+ - x2goserver-xsession/etc/Xsession: fix uname calls when (potentially)
+ creating session log/error file and add uname call where necessary.
* x2goserver.spec:
- Add sudo and logcheck as BuildRequires and Requires. Don't own
directories that are owned by sudo and logcheck. Logcheck is not
diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
index 7ad477f..5bfc60a 100755
--- a/x2goserver-xsession/etc/Xsession
+++ b/x2goserver-xsession/etc/Xsession
@@ -73,9 +73,9 @@ ALTUSERXSESSION=$HOME/.Xsession-x2go
ERRFILE=$HOME/.xsession-x2go-errors
# attempt to create an error file; abort if we cannot
-if (umask 077 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] && [ ! -L
"$ERRFILE" ]; then
+if (umask 177 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] && [ ! -L
"$ERRFILE" ]; then
chmod 600 "$ERRFILE"
-elif ERRFILE=$(mktemp 2> /dev/null); then
+elif ERRFILE=$(umask 077 && mktemp 2> /dev/null); then
if ! ln -sf "$ERRFILE" "${TMPDIR:=/tmp}/xsession-x2go-$USER"; then
message "warning: unable to symlink
\"$TMPDIR/xsession-x2go-$USER\" to" \
"\"$ERRFILE\"; look for session log/errors in" \
--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email
on /srv/git/code.x2go.org/x2goserver.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits
