From 9dcc25abc527d0b195a6c8f409792568c2d60cfd Mon Sep 17 00:00:00 2001
From: "Wayne A. Ptaff" <wayne@ptaff.ca>
Date: Fri, 3 Jun 2016 10:35:40 -0400
Subject: [PATCH] Fix sogo system user creation

---
 packaging/debian/sogo.preinst | 2 +-
 packaging/rhel/sogo.spec      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/debian/sogo.preinst b/packaging/debian/sogo.preinst
index 9b9801035..3a63d612d 100644
--- a/packaging/debian/sogo.preinst
+++ b/packaging/debian/sogo.preinst
@@ -15,7 +15,7 @@ if [ "$1" == "install" ] || [ "$1" == "upgrade" ]; then
 
   getent group sogo >& /dev/null || groupadd -f -r sogo
   if ! id sogo 1> /dev/null 2>&1; then
-    useradd -d /var/lib/sogo -g sogo -c "SOGo daemon" -s /usr/sbin/nologin -r sogo
+    useradd -d /var/lib/sogo -g sogo -c "SOGo daemon" -s /usr/sbin/nologin -r -g sogo sogo
   fi
 
   # create mandatory dirs and enforce owner+mode
diff --git a/packaging/rhel/sogo.spec b/packaging/rhel/sogo.spec
index e505b50d9..c2ca0ab1d 100644
--- a/packaging/rhel/sogo.spec
+++ b/packaging/rhel/sogo.spec
@@ -392,7 +392,7 @@ 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
+  /usr/sbin/useradd -d %{_var}/lib/sogo -c "SOGo daemon" -s /sbin/nologin -M -r -g %sogo_user %sogo_user
 fi
 
 %post