[X2Go-Commits] [x2goserver] 01/01: Unset LD_LIBRARY_PATH for the case when x2gostartagent started from x2godesktopsharing.

[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 ef7dc6a3ce512e7a1eedd5043ff3173f2384b56f
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Thu Aug 11 15:46:18 2016 +0200

    Unset LD_LIBRARY_PATH for the case when x2gostartagent started from x2godesktopsharing.
---
 debian/changelog              |    1 +
 x2goserver/bin/x2gostartagent |    2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 974914f..e50ba19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -159,6 +159,7 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low
   * New upstream version (4.1.0.0):
     - Fix x2godbadmin. Set right column name "tekidata_port" in create table.
       (Fixes: #557).
+    - Unset LD_LIBRARY_PATH for the case when x2gostartagent started from x2godesktopsharing.
 
   [ Mark Pederson-Cook ]
   * debian/po:
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 228d227..c6cfd4e 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -458,6 +458,8 @@ if [ -n "$X2GO_GEOMETRY" ] && [ "$X2GO_GEOMETRY" != "fullscreen" ]; then
 fi
 
 if  [ "$X2GO_STYPE" == "S" ]; then
+	# unset LD_LIBRARY_PATH for the case when x2gostartagent started from x2godesktopsharing
+	unset LD_LIBRARY_PATH
 	# set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is in use
 	NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE $agent_geometry -name "${SESSION_WINDOW_TITLE}"  "${NX_AGENT}" 2>"${SESSION_LOG}" &
 else

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git