[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.0.1-17-ge2dce01

X2Go dev team git-admin at x2go.org
Fri Jan 3 20:51:20 CET 2014


The branch, build-baikal has been updated
       via  e2dce016a660b225acf1b0376daa3de9c2b09899 (commit)
      from  c89c4c1b3f57a5f8fb1cf476839f48ecc54ab479 (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/x2gosqlitewrapper.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2e42dad..9c1fa64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ x2goserver (3.1.1.0-0~x2go1) UNRELEASED; urgency=low
     - Update date and version number in man pages.
     - Add syslogging to SQLite3 session DB backend for occuring
       DB failures.
+    - Specify non-sbin path in x2gosqlitewrapper.c. Allows us
+      to do system calls in x2gosqlitewrapper.pl.
   * Remove /etc/x2go/applications on package removal if it is a
     symlink, keep it, if it is a directory. Remove /etc/x2go
     (if empty after purge) on package purge.
diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c
index a134efc..78ea68d 100644
--- a/x2goserver/x2gosqlitewrapper.c
+++ b/x2goserver/x2gosqlitewrapper.c
@@ -60,7 +60,7 @@ int main( int argc, char *argv[] ) {
 		}
 
 		// derive the full path of x2gosqlitewrapper.pl from path of this binary
-		rvap = asprintf(&x2gosqlitewrapper, "%s/%s", dirname(buffer), "x2gosqlitewrapper.pl");
+		rvap = asprintf(&x2gosqlitewrapper, "PATH=/usr/local/bin:/usr/bin/:/bin %s/%s", dirname(buffer), "x2gosqlitewrapper.pl");
 		if(rvap == -1){
 			fprintf(stderr, "Failed to allocate memory calling asprintf\n");
 			exit(EXIT_FAILURE);


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