4 files changed, 4 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index cb6f489d7..a4af41d36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ openssh (1:6.5p1-3) UNRELEASED; urgency=medium
     and Michael Biebl).
   * Bump guard version for sysvinit->systemd transition to 1:6.5p1-3; we may
     have got it wrong before, and it's fairly harmless to repeat it.
+  * Remove tests for whether /dev/null is a character device from the
+    Upstart job and the systemd service files; it's there to avoid a
+    confusing failure mode in daemon(), but with modern init systems we use
+    the -D option to suppress daemonisation anyway.
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 11 Feb 2014 21:36:14 +0000
 
diff --git a/debian/openssh-server.ssh.upstart b/debian/openssh-server.ssh.upstart
index 10ab744f1..b34cbff5d 100644
--- a/debian/openssh-server.ssh.upstart
+++ b/debian/openssh-server.ssh.upstart
@@ -20,7 +20,6 @@ console none
 pre-start script
     test -x /usr/sbin/sshd || { stop; exit 0; }
     test -e /etc/ssh/sshd_not_to_be_run && { stop; exit 0; }
-    test -c /dev/null || { stop; exit 0; }
 
     mkdir -p -m0755 /var/run/sshd
 end script
diff --git a/debian/systemd/ssh.service b/debian/systemd/ssh.service
index 6f69923f1..e7209f75a 100644
--- a/debian/systemd/ssh.service
+++ b/debian/systemd/ssh.service
@@ -5,7 +5,6 @@ ConditionPathExists=!/etc/ssh/sshd_not_to_be_run
 
 [Service]
 EnvironmentFile=-/etc/default/ssh
-ExecStartPre=/usr/bin/test -c /dev/null
 ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
diff --git a/debian/systemd/ssh@.service b/debian/systemd/ssh@.service
index c2f9b1547..4b0801dbc 100644
--- a/debian/systemd/ssh@.service
+++ b/debian/systemd/ssh@.service
@@ -4,6 +4,5 @@ After=auditd.service
 
 [Service]
 EnvironmentFile=-/etc/default/ssh
-ExecStartPre=/usr/bin/test -c /dev/null
 ExecStart=-/usr/sbin/sshd -i $SSHD_OPTS
 StandardInput=socket