Only enable ssh.service for systemd, not both ssh.service and ssh.socket. Thanks to Michael Biebl for spotting this.

1 files changed, 8 insertions, 0 deletions

diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index b35e227e7..72200604e 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -311,6 +311,14 @@ if [ "$action" = configure ]; then
             # restart it under systemd.
             start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid || true
         fi
+        if dpkg --compare-versions "$2" lt 1:6.5p1-2 && \
+           deb-systemd-helper debian-installed ssh.socket && \
+           deb-systemd-helper --quiet was-enabled ssh.service && \
+           deb-systemd-helper --quiet was-enabled ssh.socket; then
+            # 1:6.5p1-1 mistakenly left both ssh.service and ssh.socket
+            # enabled.
+            deb-systemd-helper disable ssh.socket >/dev/null || true
+        fi
 fi
 
 #DEBHELPER#