[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.7-15-gac20aac

[X2go dev team]

The branch, master has been updated
       via  ac20aac62ee6ff4361b08308baef746b32ee9b8e (commit)
       via  f73cf4bc7dc508af1e771ac913389f6a6a5f2914 (commit)
      from  e4b3509fafdfe32784216183f7c89badf5aa25dc (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 ac20aac62ee6ff4361b08308baef746b32ee9b8e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Nov 8 12:44:46 2011 +0100

    type fix in x2goserver-printing.postinst

commit f73cf4bc7dc508af1e771ac913389f6a6a5f2914
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Nov 8 12:44:23 2011 +0100

    Fix non-local printing with X2Go: x2goprint user on X2Go server host needs a shell to accept incoming print jobs from the central CUPS server(s).

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                    |    3 +++
 debian/x2goserver-printing.postinst |    7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 96f7613..8c98a0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ x2goserver (3.0.99.8-0~x2go1) UNRELEASED; urgency=low
     - Set X2Go log level to info when running Xsession parts.
   * Make sure that package scripts (postinst, postrm, etc.) exit with
     exit code 0 at the end of the script.
+  * Fix non-local printing with X2Go: x2goprint user on X2Go server host
+    needs a shell to accept incoming print jobs from the central CUPS
+    server(s).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 26 Oct 2011 17:37:10 +0200
 
diff --git a/debian/x2goserver-printing.postinst b/debian/x2goserver-printing.postinst
index 00aa2b4..c75484e 100755
--- a/debian/x2goserver-printing.postinst
+++ b/debian/x2goserver-printing.postinst
@@ -35,12 +35,15 @@ case "$1" in
 			echo "Creating x2goprint user." >&2
 			adduser --system \
 			        --disabled-password --disabled-login \
-			        --shell /bin/false --group --home /var/spool/x2goprint x2goprint
+			        --shell /bin/sh --group --home /var/spool/x2goprint x2goprint
 		else
 			echo "User x2goprint already exists." >&2
 			# make sure all settings are appropriate
 			if [ "`id -gn x2goprint`" != "x2goprint" ]; then
-				usermod --gid x2goprint# x2goprint
+				usermod --gid x2goprint x2goprint
+			fi
+			if [ "getent passwd x2goprint" | egrep -v '^.*:x:.*:.*:.*:.*:/bin/sh$' &>/dev/null ]; then
+				usermod --shell /bin/sh x2goprint
 			fi
 			if [ "`ls -1d ~x2goprint`" != "/var/spool/x2goprint" ]; then
 				test -d /var/spool/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).