[X2Go-Commits] [x2gobroker] 02/03: debian/x2gobroker-ssh.postinst: Assure proper file permissions, owner and group settings for x2gobroker-ssh.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 9e44861e4a29897228cb70a95d6853dbe85779b0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Apr 1 05:50:45 2015 +0200

    debian/x2gobroker-ssh.postinst: Assure proper file permissions, owner and group settings for x2gobroker-ssh.
---
 debian/changelog               |    3 +++
 debian/x2gobroker-ssh.postinst |    8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 51c8191..ffdf318 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -313,6 +313,9 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
       removal of the x2gobroker user/group.
     + Pass $@ to our apacheconf_configure, apacheconf_remove functions to not
       break apache2-maintscript-helper.
+  * debian/x2gobroker-ssh.postinst:
+    + Assure proper file permissions, owner and group settings for
+      x2gobroker-ssh.
   * debian/*.postinst:
     + Assure that the log directory always exists (no matter what combination
       of packages got installed).
diff --git a/debian/x2gobroker-ssh.postinst b/debian/x2gobroker-ssh.postinst
index 6631767..45bdd6f 100755
--- a/debian/x2gobroker-ssh.postinst
+++ b/debian/x2gobroker-ssh.postinst
@@ -64,13 +64,19 @@ case "$1" in
 				elif ! getent group $group >/dev/null; then
 					echo "Creating $group group." 1>&2
 					addgroup $group
+
+					# invalidate group cache before proceeding...
+					if which nscd 1>/dev/null; then
+						nscd -i group
+					fi
+
 				else
 					echo "Group »$group« already exists." 1>&2
 				fi
 			fi
 
 			# the x2gobroker-ssh wrapper needs special permissions for its executable
-			if [ "$group" != "$last_group" ]; then
+			if [ "$group" != "$last_group" ] || [ "$create_group" = "true" ]; then
 
 				if dpkg-statoverride --list /usr/bin/x2gobroker-ssh 1>/dev/null; then
 					dpkg-statoverride --remove /usr/bin/x2gobroker-ssh

--
Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git