[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.0.99-2-194-g6957a36

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


The branch, build-main has been updated
       via  6957a368ee4202a90be8c844173196660ad5a8c5 (commit)
      from  2c29f94eb6bef8a28bdcdecf1ad29958bf6a2b82 (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 ++
 debian/x2goserver.postinst |   45 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index df05592..49e30f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Fix for TERMINAL command execution if konsole (KDE4) is installed on the
     server (closes upstream issue #87).
   * Silence x2golistsessions on missing session.log files.
+  * Create x2goprint user/group on package installation, add same info to INSTALL howto.
+  * Change permissions on x2goprint, using 2755:root:x2goprint (setgid).
 
   [Martin Oehler]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst
index 76cae94..f856e86 100755
--- a/debian/x2goserver.postinst
+++ b/debian/x2goserver.postinst
@@ -25,6 +25,10 @@ case "$1" in
 		touch     /etc/x2go/x2gosql/passwords/pgadmin
 		chmod 600 /etc/x2go/x2gosql/passwords/pgadmin
 
+		###
+		### X2go session DB management
+		###
+
 		# setup x2gouser and group
 		if ! getent group x2gouser >/dev/null; then
 			echo "Creating x2gouser group." >&2
@@ -46,7 +50,7 @@ case "$1" in
 			if [ "`ls -1d ~x2gouser`" != "/var/lib/x2go" ]; then
 				usermod --move-home --home /var/lib/x2go x2gouser
 			fi
-			# leave user shell alone. we have never set this wrongly
+			# we leave user shell alone. we have never set this wrongly
 			# and we need to respect the administrator's choices
 		fi
 
@@ -61,6 +65,8 @@ case "$1" in
 			chmod 0660 /var/lib/x2go/x2go_sessions
 		fi
 
+		### setgid section for x2gouser (SQLite DB access)
+
 		# we may be upgrading versions of x2goserver that had
 		# /usr/lib/x2go/x2gosqlitewrapper.pl set to setuid x2gouser.
 		if dpkg-statoverride --list /usr/lib/x2go/x2gosqlitewrapper.pl >/dev/null; then
@@ -80,8 +86,45 @@ case "$1" in
 		if ! dpkg-statoverride --list /usr/lib/x2go/x2gosqlitewrapper >/dev/null; then
 		    dpkg-statoverride --add --update root x2gouser 2755 /usr/lib/x2go/x2gosqlitewrapper
 		fi
+
+		###
+		### X2go printing
+		###
+
+		# setup x2goprint user and x2goprint group
+		if ! getent group x2goprint >/dev/null; then
+			echo "Creating x2goprint group." >&2
+			addgroup --system x2goprint
+		else
+			echo "Group x2goprint already exists." >&2
+		fi
+		if ! getent passwd x2goprint >/dev/null; then
+			echo "Creating x2goprint user." >&2
+			adduser --system --no-create-home \
+			        --disabled-password --disabled-login \
+			        --shell /bin/false --group --home /var/spool/x2goprint x2goprint
+		else
+			echo "User x2goprint already exists." >&2
+			# make sure all settings are appropriate
+			if [ "`id -gn x2gprint`" != "x2goprint" ]; then
+				usermod --gid x2goprint# x2goprint
+			fi
+			if [ "`ls -1d ~x2goprint`" != "/var/spool/x2goprint" ]; then
+				usermod --move-home --home /var/spool/x2goprint x2goprint
+			fi
+			# we leave user shell alone. we have never set this wrongly
+			# and we need to respect the administrator's choices
+		fi
+
+		### setgid section for x2goprint (X2go printing)
+
+		# the x2goprint command can only be run by users that are in group x2goprint
+		if ! dpkg-statoverride --list /usr/bin/x2goprint >/dev/null; then
+		    dpkg-statoverride --add --update root x2goprint 2755 /usr/bin/x2goprint
+		fi
 		;;
 
+
 	abort-upgrade|abort-remove|abort-deconfigure)
 		;;
 


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