1 files changed, 11 insertions, 1 deletions

diff --git a/debian/postinst b/debian/postinst
index 1b741c203..41221b9d6 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -280,9 +280,18 @@ set_sshd_permissions() {
 }
 
 
+fix_ssh_group() {
+        # Try to remove non-system group mistakenly created by 1:3.5p1-1.
+        # set_ssh_agent_permissions() below will re-create it properly.
+        if getent group | grep -q '^ssh:'; then
+                delgroup --quiet ssh || true
+        fi
+}
+
+
 set_ssh_agent_permissions() {
         if ! getent group | grep -q '^ssh:'; then
-                addgroup --quiet ssh
+                addgroup --system --quiet ssh
         fi
         if ! [ -x /usr/sbin/dpkg-statoverride ] || \
             ! dpkg-statoverride --list /usr/bin/ssh-agent >/dev/null ; then
@@ -323,6 +332,7 @@ fix_statoverride
 create_alternatives
 setup_sshd_user
 set_sshd_permissions
+if [ "$2" = "1:3.5p1-1" ]; then fix_ssh_group; fi
 set_ssh_agent_permissions
 setup_startup
 setup_init