3 files changed, 17 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 60f8d39a3..9e821ff25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:6.5p1-2) UNRELEASED; urgency=medium
+
+  * Only enable ssh.service for systemd, not both ssh.service and
+    ssh.socket.  Thanks to Michael Biebl for spotting this.
+
+ -- Colin Watson <cjwatson@debian.org>  Tue, 11 Feb 2014 10:41:26 +0000
+
 openssh (1:6.5p1-1) unstable; urgency=medium
 
   * New upstream release (http://www.openssh.com/txt/release-6.5,
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#
diff --git a/debian/rules b/debian/rules
index c8870b3a4..0b63cbd48 100755
--- a/debian/rules
+++ b/debian/rules
@@ -191,7 +191,8 @@ override_dh_installdocs:
         mkdir -p debian/openssh-server/usr/share/doc/openssh-client
 
 override_dh_systemd_enable:
-        dh_systemd_enable --name ssh
+        dh_systemd_enable --name ssh ssh.service
+        dh_systemd_enable --name ssh --no-enable ssh.socket
 
 override_dh_installinit:
         dh_installinit -R --name ssh -- start 16 2 3 4 5 .