[X2go-Commits] x2gobroker.git - master (branch) updated: 0.0.0.1-54-g5e3b718

X2Go dev team git-admin at x2go.org
Thu Feb 21 11:24:50 CET 2013


The branch, master has been updated
       via  5e3b7181c636d462daa68aa83ec00a78554808be (commit)
      from  9b7afc801b779c468dffcec904513f8cd6302df9 (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 5e3b7181c636d462daa68aa83ec00a78554808be
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Feb 21 11:27:27 2013 +0100

    x2gobroker sysuser needs a real home and bash as shell for the agent to work properly

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

Summary of changes:
 debian/x2gobroker-agent.postinst  |   14 ++++++++++++--
 debian/x2gobroker-agent.postrm    |    1 +
 debian/x2gobroker-daemon.postinst |   14 ++++++++++++--
 debian/x2gobroker-daemon.postrm   |    1 +
 4 files changed, 26 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/x2gobroker-agent.postinst b/debian/x2gobroker-agent.postinst
index 95faece..3f7c1ed 100755
--- a/debian/x2gobroker-agent.postinst
+++ b/debian/x2gobroker-agent.postinst
@@ -33,11 +33,21 @@ case "$1" in
 		fi
 		if ! getent passwd x2gobroker >/dev/null; then
 			echo "Creating x2gobroker user." >&2
-			adduser --system --no-create-home \
+			adduser --system \
 			        --disabled-password --disabled-login \
-			        --shell /bin/false --group --home /dev/null x2gobroker
+			        --shell /bin/bash --group --home /var/lib/x2gobroker x2gobroker
 		else
 			echo "User x2gobroker already exists." >&2
+			# make sure all settings are appropriate
+			if getent passwd x2gobroker | grep /dev/null 1>/dev/null 2>/dev/null; then
+				mkdir -p /var/lib/x2gobroker
+				usermod --home /var/lib/x2gobroker x2gobroker
+			fi
+			if getent passwd x2gobroker | grep /bin/false 1>/dev/null 2>/dev/null; then
+				usermod --shell /bin/bash x2gobroker
+			fi
+			# make sure the home directory belongs to x2gouser:x2gouser
+			chown x2gobroker:x2gobroker /var/lib/x2gobroker -Rf
 		fi
 
 		# the x2gobroker-agent has to be installed setuid root
diff --git a/debian/x2gobroker-agent.postrm b/debian/x2gobroker-agent.postrm
index e96ebe8..a9dc429 100755
--- a/debian/x2gobroker-agent.postrm
+++ b/debian/x2gobroker-agent.postrm
@@ -27,6 +27,7 @@ case "$1" in
 			getent passwd x2gobroker >/dev/null && deluser x2gobroker
 			getent group x2gobroker >/dev/null && delgroup x2gobroker
 			getent group x2gobroker >/dev/null && delgroup x2gobroker
+			rm -Rfv /var/lib/x2gobroker
 		fi
 
 		;;
diff --git a/debian/x2gobroker-daemon.postinst b/debian/x2gobroker-daemon.postinst
index dea98bc..b37c2f5 100755
--- a/debian/x2gobroker-daemon.postinst
+++ b/debian/x2gobroker-daemon.postinst
@@ -33,11 +33,21 @@ case "$1" in
 		fi
 		if ! getent passwd x2gobroker >/dev/null; then
 			echo "Creating x2gobroker user." >&2
-			adduser --system --no-create-home \
+			adduser --system \
 			        --disabled-password --disabled-login \
-			        --shell /bin/false --group --home /dev/null x2gobroker
+			        --shell /bin/bash --group --home /var/lib/x2go x2gobroker
 		else
 			echo "User x2gobroker already exists." >&2
+			# make sure all settings are appropriate
+			if getent passwd x2gobroker | grep /dev/null 1>/dev/null 2>/dev/null; then
+				mkdir -p /var/lib/x2gobroker
+				usermod --home /var/lib/x2gobroker x2gobroker
+			fi
+			if getent passwd x2gobroker | grep /bin/false 1>/dev/null 2>/dev/null; then
+				usermod --shell /bin/bash x2gobroker
+			fi
+			# make sure the home directory belongs to x2gouser:x2gouser
+			chown x2gobroker:x2gobroker /var/lib/x2gobroker -Rf
 		fi
 
 		# the x2gobroker-daemon needs special permissions on its log directory
diff --git a/debian/x2gobroker-daemon.postrm b/debian/x2gobroker-daemon.postrm
index a8ebd42..42f3752 100755
--- a/debian/x2gobroker-daemon.postrm
+++ b/debian/x2gobroker-daemon.postrm
@@ -28,6 +28,7 @@ case "$1" in
 			getent passwd x2gobroker >/dev/null && deluser x2gobroker
 			getent group x2gobroker >/dev/null && delgroup x2gobroker
 			getent group x2gobroker >/dev/null && delgroup x2gobroker
+			rm -Rf /var/lib/x2gobroker
 		fi
 
 		;;


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).




More information about the x2go-commits mailing list