From c46a5f8df76fdfac18e88be9f0009be40f1c9df4 Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Mon, 30 May 2016 11:40:25 -0400 Subject: [PATCH] Ensure 'sogo' UNIX group exists at installation Previous logic only checked for user existence. --- packaging/debian-multiarch/sogo.preinst | 2 +- packaging/debian/sogo.preinst | 2 +- packaging/rhel/sogo.spec | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packaging/debian-multiarch/sogo.preinst b/packaging/debian-multiarch/sogo.preinst index 85198eb23..9b9801035 100644 --- a/packaging/debian-multiarch/sogo.preinst +++ b/packaging/debian-multiarch/sogo.preinst @@ -13,8 +13,8 @@ set -e if [ "$1" == "install" ] || [ "$1" == "upgrade" ]; then + getent group sogo >& /dev/null || groupadd -f -r sogo if ! id sogo 1> /dev/null 2>&1; then - groupadd -f -r sogo useradd -d /var/lib/sogo -g sogo -c "SOGo daemon" -s /usr/sbin/nologin -r sogo fi diff --git a/packaging/debian/sogo.preinst b/packaging/debian/sogo.preinst index 85198eb23..9b9801035 100644 --- a/packaging/debian/sogo.preinst +++ b/packaging/debian/sogo.preinst @@ -13,8 +13,8 @@ set -e if [ "$1" == "install" ] || [ "$1" == "upgrade" ]; then + getent group sogo >& /dev/null || groupadd -f -r sogo if ! id sogo 1> /dev/null 2>&1; then - groupadd -f -r sogo useradd -d /var/lib/sogo -g sogo -c "SOGo daemon" -s /usr/sbin/nologin -r sogo fi diff --git a/packaging/rhel/sogo.spec b/packaging/rhel/sogo.spec index c2e8618b1..e505b50d9 100644 --- a/packaging/rhel/sogo.spec +++ b/packaging/rhel/sogo.spec @@ -388,6 +388,9 @@ rm -fr ${RPM_BUILD_ROOT} # **************************** pkgscripts ***************************** %pre +if ! getent group %sogo_user >& /dev/null; then + groupadd -f -r %sogo_user +fi if ! id %sogo_user >& /dev/null; then /usr/sbin/useradd -d %{_var}/lib/sogo -c "SOGo daemon" -s /sbin/nologin -M -r %sogo_user fi