x2go-commits August 2011

x2go-commits@lists.x2go.org

1 participants
75 discussions

x2goserver.git - master (branch) updated: 3.0.99-2-213-g103e231
by git-admin＠x2go.org 30 Aug '11

30 Aug '11

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(a)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(a)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).

1 0

cups-x2go.git - master (branch) updated: 3.0.0.2-16-ge6bae2c
by git-admin＠x2go.org 30 Aug '11

30 Aug '11

The branch, master has been updated via e6bae2cd4b9cbed83cee9f8d495985d713d676fc (commit) from 5b51e6ffce26af411dc17311ff5fa49b54355fe6 (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 e6bae2cd4b9cbed83cee9f8d495985d713d676fc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 13:49:40 2011 +0200 syslog fixes ----------------------------------------------------------------------- Summary of changes: cups-x2go | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index d1e6f73..ddba23d 100755 --- a/cups-x2go +++ b/cups-x2go @@ -1,5 +1,5 @@ -#!/usr/bin/perl -# x2go CUPS backend +!/usr/bin/perl +# X2go CUPS backend # Copyright 2009-2011 Obviously Nice # # This program is free software; you can redistribute it and/or modify it @@ -24,7 +24,7 @@ use File::Copy; use strict; setlogsock('unix'); -openlog($0,'','user'); +openlog($0,'cons,pid','user'); my $x2goserver = "local"; my $printdsa = "/root/.x2go/ssh/.x2goprint/id_dsa"; @@ -113,7 +113,7 @@ sub printfile system( "su x2goprint -c \"which x2gobasepath &>/dev/null && test -f \$(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName $sess $sess$bname $sess$bname.title || sudo x2goprint $userName $sess $sess$bname $sess$bname.title\"" ); # log that we processed a print job - syslog('info', "su x2goprint -c \"which x2gobasepath &>/dev/null && test -f \$(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName $sess $bname $bname.title || sudo x2goprint $userName $sess $bname $bname.title\""); + syslog('debug', "su x2goprint -c \"which x2gobasepath &>/dev/null && test -f \$(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName $sess $bname $bname.title || sudo x2goprint $userName $sess $bname $bname.title\""); } else { @@ -144,7 +144,7 @@ my $printOptions; my $printFile; ($jobID, $userName, $jobTitle, $copies, $printOptions, $printFile) = @ARGV; -syslog('notice', "Print job received from cups-> $jobID $userName $jobTitle $copies $printOptions $printFile"); +syslog('info', "Print job received from cups -> $jobID $userName $jobTitle $copies $printOptions $printFile"); my $tempFile; if (!$printFile) @@ -182,7 +182,7 @@ for(my $i=0; $i<scalar(@sessions);$i++ ) if(@sinfo[4] eq "R") { printfile( $printFile, $titleFile, @sinfo[3], @sinfo[1]); - syslog('info', "Call to printfile function with: $printFile $titleFile @sinfo[3] @sinfo[1]\n"); + syslog('debug', "Call to printfile function with: $printFile $titleFile @sinfo[3] @sinfo[1]\n"); } } hooks/post-receive -- cups-x2go.git (CUPS Backend for X2go Printing) 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 "cups-x2go.git" (CUPS Backend for X2go Printing).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-211-gef41f8d
by git-admin＠x2go.org 30 Aug '11

30 Aug '11

The branch, master has been updated via ef41f8d075da08aa016605504ec1e906c4e9f97f (commit) from f1a1b65d3aeb14b21f18be2d08f846bd09241275 (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 ef41f8d075da08aa016605504ec1e906c4e9f97f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 13:16:16 2011 +0200 fix for x2goprint install location ----------------------------------------------------------------------- Summary of changes: debian/x2goserver.install | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/x2goserver.install b/debian/x2goserver.install index 416bcfb..9b7c34c 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -5,5 +5,5 @@ x2goserver/etc/x2gosql/sql /etc/x2go/x2gosql/ x2goserver/etc/x2goserver.conf /etc/x2go/ x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ x2goserver/x2gosqlitewrapper /usr/lib/x2go/ -x2goserver/x2goprint /usr/bin/x2goprint +x2goserver/x2goprint /usr/bin/ 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).

1 0

cups-x2go.git - master (branch) updated: 3.0.0.2-15-g5b51e6f
by git-admin＠x2go.org 30 Aug '11

30 Aug '11

The branch, master has been updated via 5b51e6ffce26af411dc17311ff5fa49b54355fe6 (commit) from 2eac6643e69cb7046a22fd228dbd4a09beeb525d (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 5b51e6ffce26af411dc17311ff5fa49b54355fe6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 12:22:25 2011 +0200 Fix for syslog command. ----------------------------------------------------------------------- Summary of changes: cups-x2go | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index 9f18135..d1e6f73 100755 --- a/cups-x2go +++ b/cups-x2go @@ -144,7 +144,7 @@ my $printOptions; my $printFile; ($jobID, $userName, $jobTitle, $copies, $printOptions, $printFile) = @ARGV; -syslog('notice', "Print job received from cups-> $jobID $userName $jobTitle $copies $printOptions $sepa $printFile"); +syslog('notice', "Print job received from cups-> $jobID $userName $jobTitle $copies $printOptions $printFile"); my $tempFile; if (!$printFile) hooks/post-receive -- cups-x2go.git (CUPS Backend for X2go Printing) 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 "cups-x2go.git" (CUPS Backend for X2go Printing).

1 0

cups-x2go.git - master (branch) updated: 3.0.0.2-14-g2eac664
by git-admin＠x2go.org 30 Aug '11

30 Aug '11

The branch, master has been updated via 2eac6643e69cb7046a22fd228dbd4a09beeb525d (commit) from c75449e1439bab59f673fd62113466d956aeb60c (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 2eac6643e69cb7046a22fd228dbd4a09beeb525d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 12:16:31 2011 +0200 Add a proper dpkg-statoverride check in postinst script. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/cups-x2go.postinst | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 26979b1..c860558 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ cups-x2go (3.0.0.2-0~x2go2) UNRELEASED; urgency=low on CUPS backend makes CUPS run this backend with root-privileges which is needed for cups-x2go to work. * Adapt to x2goprint setgid change in x2goserver package (>=3.0.99.6). + * Add a proper dpkg-statoverride check in postinst script. [ Mario Oroz ] * Add syslog support for cups-x2go. diff --git a/debian/cups-x2go.postinst b/debian/cups-x2go.postinst index 5dcda22..896ddeb 100755 --- a/debian/cups-x2go.postinst +++ b/debian/cups-x2go.postinst @@ -21,7 +21,10 @@ set -e case "$1" in configure) - dpkg-statoverride --add --update root root 0700 /usr/lib/cups/backend/cups-x2go || true + # the x2goprint command can only be run by users that are in group x2goprint + if ! dpkg-statoverride --list /usr/lib/cups/backend/cups-x2go >/dev/null; then + dpkg-statoverride --add --update root root 0700 /usr/lib/cups/backend/cups-x2go + fi ;; abort-upgrade|abort-remove|abort-deconfigure) hooks/post-receive -- cups-x2go.git (CUPS Backend for X2go Printing) 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 "cups-x2go.git" (CUPS Backend for X2go Printing).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-210-gf1a1b65
by git-admin＠x2go.org 30 Aug '11

30 Aug '11

The branch, master has been updated via f1a1b65d3aeb14b21f18be2d08f846bd09241275 (commit) from 2d69ae1bf2f7d37b05fd3789e9559b302204440f (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 f1a1b65d3aeb14b21f18be2d08f846bd09241275 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 11:51:27 2011 +0200 now also installing x2goprint into the x2goserver package... (grml) ----------------------------------------------------------------------- Summary of changes: debian/x2goserver.install | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/x2goserver.install b/debian/x2goserver.install index 5f1395a..416bcfb 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -5,4 +5,5 @@ x2goserver/etc/x2gosql/sql /etc/x2go/x2gosql/ x2goserver/etc/x2goserver.conf /etc/x2go/ x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ x2goserver/x2gosqlitewrapper /usr/lib/x2go/ +x2goserver/x2goprint /usr/bin/x2goprint 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).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-209-g2d69ae1
by git-admin＠x2go.org 30 Aug '11

30 Aug '11

The branch, master has been updated via 2d69ae1bf2f7d37b05fd3789e9559b302204440f (commit) via 258984227b5ba43e30dd0df37ff946d487a74517 (commit) from ac2a2b7e284242172e571c72991429cb497a4646 (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 2d69ae1bf2f7d37b05fd3789e9559b302204440f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 11:43:24 2011 +0200 add permission setting for home dir commit 258984227b5ba43e30dd0df37ff946d487a74517 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 11:42:20 2011 +0200 make sure permissions for /var/spool/x2goprint are set correctly ----------------------------------------------------------------------- Summary of changes: INSTALL | 5 +++-- debian/x2goserver.dirs | 1 + debian/x2goserver.postinst | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/INSTALL b/INSTALL index 20a093a..15a0dfb 100644 --- a/INSTALL +++ b/INSTALL @@ -14,9 +14,10 @@ Set up x2goprint account and its group if they do not exist already: $ groupadd --system x2goprint - $ useradd --system --no-create-home \ + $ useradd --system \ --shell /bin/false --home /var/spool/x2goprint x2goprint - + $ chown x2goprint:x2goprint ~x2goprint + $ chmod 0770 ~x2goprint 2.) INSTALL x2goserver FILES ----------------------------- diff --git a/debian/x2goserver.dirs b/debian/x2goserver.dirs index 8699a0c..bcef06a 100644 --- a/debian/x2goserver.dirs +++ b/debian/x2goserver.dirs @@ -7,3 +7,4 @@ 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 d59b65d..257da39 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -116,6 +116,11 @@ case "$1" in # and we need to respect the administrator's choices fi + # make sure x2goprint spool dir permissions are set correctly + chown -R x2goprint:x2goprint /var/spool/x2goprint + # egid x2goprint needs write access to the spool dir + chmod 0770 /var/spool/x2goprint + ### setgid section for x2goprint (X2go printing) # the x2goprint command can only be run by users that are in group x2goprint 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).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-207-gac2a2b7
by git-admin＠x2go.org 30 Aug '11

30 Aug '11

The branch, master has been updated via ac2a2b7e284242172e571c72991429cb497a4646 (commit) via 218bb8adc3d92f3ed45d8d4f3769068ae7e850b5 (commit) from 09bc0a02f32073184326a06f604a72081ec54878 (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 ac2a2b7e284242172e571c72991429cb497a4646 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 11:31:29 2011 +0200 Purge section for x2goprint user and setgid bit on x2goprint wrapper in x2goserver.postrm. commit 218bb8adc3d92f3ed45d8d4f3769068ae7e850b5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 11:29:27 2011 +0200 remove x2gouser group and x2gousers group if empty... ----------------------------------------------------------------------- Summary of changes: debian/x2goserver.postrm | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm index a5cdf21..423d45e 100755 --- a/debian/x2goserver.postrm +++ b/debian/x2goserver.postrm @@ -25,7 +25,14 @@ case "$1" in rm -vf /var/lib/x2go/x2go_sessions rm -vf /etc/x2go/x2gosql/passwords/pgadmin getent passwd x2gouser >/dev/null && deluser x2gouser + getent group x2gouser >/dev/null && delgroup x2gouser getent group x2gousers >/dev/null && delgroup x2gousers + + if dpkg-statoverride --list /usr/bin/x2goprint >/dev/null; then + dpkg-statoverride --remove /usr/bin/x2goprint + fi + getent passwd x2goprint >/dev/null && deluser x2goprint + getent group x2goprint >/dev/null && delgroup x2goprint ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; 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).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-205-g09bc0a0
by git-admin＠x2go.org 30 Aug '11

30 Aug '11

The branch, master has been updated via 09bc0a02f32073184326a06f604a72081ec54878 (commit) from a851ed4e8be7b6989eb37830f0777f5bd190b8f0 (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 09bc0a02f32073184326a06f604a72081ec54878 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 11:21:10 2011 +0200 typo fix in postinst script ----------------------------------------------------------------------- Summary of changes: debian/x2goserver.postinst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index f856e86..d59b65d 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -106,7 +106,7 @@ case "$1" in else echo "User x2goprint already exists." >&2 # make sure all settings are appropriate - if [ "`id -gn x2gprint`" != "x2goprint" ]; then + if [ "`id -gn x2goprint`" != "x2goprint" ]; then usermod --gid x2goprint# x2goprint fi if [ "`ls -1d ~x2goprint`" != "/var/spool/x2goprint" ]; then 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).

1 0

cups-x2go.git - master (branch) updated: 3.0.0.2-13-gc75449e
by git-admin＠x2go.org 30 Aug '11

30 Aug '11

The branch, master has been updated via c75449e1439bab59f673fd62113466d956aeb60c (commit) from 59c2429e0897568b5815eb50a71dbcd7b9a40188 (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 c75449e1439bab59f673fd62113466d956aeb60c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Aug 30 11:11:06 2011 +0200 After thinking more thoroughly about x2goprint execution variants (different x2goserver versions)... ----------------------------------------------------------------------- Summary of changes: cups-x2go | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index 1045a0e..9f18135 100755 --- a/cups-x2go +++ b/cups-x2go @@ -92,7 +92,7 @@ sub getsessions { # Calling x2goprint with a single parameter <username> will result in an x2golistsessions --all-servers command on the # remote X2go server. - $sesslist=`ssh -i $printdsa x2goprint\@$x2goserver 'test -f $(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName || sudo x2goprint $userName"`; + $sesslist=`ssh -i $printdsa x2goprint\@$x2goserver "which x2gobasepath &>/dev/null && test -f \$(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName || sudo x2goprint $userName"`; } @sessions=split("\n",$sesslist); } @@ -110,15 +110,15 @@ sub printfile copy($tfile, "$spfile.title"); chown $uid,$gid,"$spfile"; chown $uid,$gid,"$spfile.title"; - system( "su x2goprint -c \"x2goprint $userName $sess $sess$bname $sess$bname.title\"" ); + system( "su x2goprint -c \"which x2gobasepath &>/dev/null && test -f \$(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName $sess $sess$bname $sess$bname.title || sudo x2goprint $userName $sess $sess$bname $sess$bname.title\"" ); # log that we processed a print job - syslog('info', "su x2goprint -c \"x2goprint $userName $sess $bname $bname.title\""); + syslog('info', "su x2goprint -c \"which x2gobasepath &>/dev/null && test -f \$(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName $sess $bname $bname.title || sudo x2goprint $userName $sess $bname $bname.title\""); } else { system ("scp -i $printdsa $pfile $tfile x2goprint\@$x2goserver:~x2goprint/"); - system( "ssh -i $printdsa x2goprint\@$x2goserver \"sudo x2goprint $userName $sess $bname $bname.title\"" ); + system( "ssh -i $printdsa x2goprint\@$x2goserver \"which x2gobasepath &>/dev/null && test -f \$(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName $sess $bname $bname.title || sudo x2goprint $userName $sess $bname $bname.title\"" ); } } hooks/post-receive -- cups-x2go.git (CUPS Backend for X2go Printing) 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 "cups-x2go.git" (CUPS Backend for X2go Printing).

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits August 2011