[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.0.99.7-14-gf73cf4b

X2Go dev team git-admin at x2go.org
Wed Dec 4 06:17:59 CET 2013


The branch, build-main has been updated
       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 -----------------------------------------------------------------
-----------------------------------------------------------------------

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

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..eb438b2 100755
--- a/debian/x2goserver-printing.postinst
+++ b/debian/x2goserver-printing.postinst
@@ -35,13 +35,16 @@ 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
 			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 && \
 					usermod --home /var/spool/x2goprint 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).




More information about the x2go-commits mailing list