The branch, master has been updated via 103e231b27adfe1f557cfd097eb1c4eeb853dbe4 (commit) via 7c22803b8c79db67011fb7a2c35af5ff5a60d350 (commit) from ef41f8d075da08aa016605504ec1e906c4e9f97f (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 ----------------------------------------------------------------- commit 103e231b27adfe1f557cfd097eb1c4eeb853dbe4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 30 15:10:53 2011 +0200 Hand over creation of ~x2goprint to adduser script. commit 7c22803b8c79db67011fb7a2c35af5ff5a60d350 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 30 14:46:02 2011 +0200 derive x2goprint.pl full path name properly ----------------------------------------------------------------------- Summary of changes: debian/x2goserver.dirs | 1 - debian/x2goserver.postinst | 2 +- x2goserver/x2goprint.c | 6 +----- x2goserver/x2gosqlitewrapper.c | 5 ----- 4 files changed, 2 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/debian/x2goserver.dirs b/debian/x2goserver.dirs index bcef06a..8699a0c 100644 --- a/debian/x2goserver.dirs +++ b/debian/x2goserver.dirs @@ -7,4 +7,3 @@ usr/lib/x2go usr/share/x2go usr/share/x2go/versions var/lib/x2go -var/spool/x2goprint diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 257da39..c3b5a3f 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -100,7 +100,7 @@ case "$1" in fi if ! getent passwd x2goprint >/dev/null; then echo "Creating x2goprint user." >&2 - adduser --system --no-create-home \ + adduser --system \ --disabled-password --disabled-login \ --shell /bin/false --group --home /var/spool/x2goprint x2goprint else diff --git a/x2goserver/x2goprint.c b/x2goserver/x2goprint.c index 8f177ca..9151d17 100644 --- a/x2goserver/x2goprint.c +++ b/x2goserver/x2goprint.c @@ -28,8 +28,6 @@ #include <errno.h> - - int main( int argc, char *argv[] ) { char * x2goprint = NULL; size_t path_max; @@ -62,15 +60,13 @@ int main( int argc, char *argv[] ) { exit(EXIT_FAILURE); } - // derive the full path of x2goprint.pl from path of this binary - rvap = asprintf(&x2goprint, "%s/../lib/x2go/%s", dirname(buffer), "x2goprint.pl"); + rvap = asprintf(&x2goprint, "%s/lib/x2go/%s", dirname(dirname(buffer)), "x2goprint.pl"); if(rvap == -1){ fprintf(stderr, "Failed to allocate memory calling asprintf\n"); exit(EXIT_FAILURE); } - // execute the script, running with user-rights of this binary execv(x2goprint, argv); diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c index 95e2a8a..2b66245 100644 --- a/x2goserver/x2gosqlitewrapper.c +++ b/x2goserver/x2gosqlitewrapper.c @@ -27,9 +27,6 @@ #include <libgen.h> #include <errno.h> - - - int main( int argc, char *argv[] ) { char * x2gosqlitewrapper = NULL; size_t path_max; @@ -62,7 +59,6 @@ int main( int argc, char *argv[] ) { exit(EXIT_FAILURE); } - // derive the full path of x2gosqlitewrapper.pl from path of this binary rvap = asprintf(&x2gosqlitewrapper, "%s/%s", dirname(buffer), "x2gosqlitewrapper.pl"); if(rvap == -1){ @@ -70,7 +66,6 @@ int main( int argc, char *argv[] ) { exit(EXIT_FAILURE); } - // execute the script, running with user-rights of this binary execv(x2gosqlitewrapper, argv); 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).