[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.0.99-2-304-g059350c
X2Go dev team
git-admin at x2go.org
Wed Dec 4 06:17:53 CET 2013
The branch, build-main has been updated
via 059350c3ab42affeae78e7b14042838f46b69acd (commit)
from b24531392088b16364a4e3730630f16dcdc0ec2f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
x2goserver/bin/x2gostartagent | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8890f61..324f095 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -87,6 +87,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
* Makefile update for including x2gofeature scripts into installation, minor fixes
to x2goserver core package Makefile.
* Add debug output around shadow session startup (in x2gostartagent).
+ * Pass extra argument $USER to client-mode x2godesktopsharing, requires
+ x2godesktopsharing (>=3.0.1.3) for it to work.
[ Ivan Kabaivanov ]
* Makefile fix around man page installation in x2goserver-compat package.
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 0ffda4e..2759865 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -54,8 +54,8 @@ if [ "$X2GO_STYPE" == "S" ]; then
if [ "$SHADOW_USER" != "$USER" ]; then
$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "user ,,$USER'' requests desktop sharing from user ,,$SHADOW_USER'' for desktop ,,$SHADOW_DESKTOP''"
- $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command: x2godesktopsharing client $X2GO_CLIENT $@"
- OUTPUT=`x2godesktopsharing client $X2GO_CLIENT $@`
+ $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command: x2godesktopsharing client $X2GO_CLIENT $@ $USER"
+ OUTPUT=`x2godesktopsharing client $X2GO_CLIENT $@ $USER`
$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command result is: $OUTPUT"
if [ "$OUTPUT" == "DENY" ]; then
echo "ACCESS DENIED" 1>&2
hooks/post-receive
--
x2goserver.git (X2Go Server)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).
More information about the x2go-commits
mailing list