diff -Nru openssh-5.3p1/debian/changelog openssh-5.3p1/debian/changelog --- openssh-5.3p1/debian/changelog 2010-05-18 20:10:24.000000000 +0300 +++ openssh-5.3p1/debian/changelog 2010-12-28 21:03:22.000000000 +0200 @@ -1,3 +1,10 @@ +openssh (1:5.3p1-3ubuntu5) lucid; urgency=low + + * debian/openssh-server.ssh.upstart: drop 'expect fork' and run sshd + with -D to avoid losing track on reload (LP: #687535) + + -- Imre Gergely Tue, 28 Dec 2010 21:02:29 +0200 + openssh (1:5.3p1-3ubuntu4) lucid-proposed; urgency=low * Backport from trunk: diff -Nru openssh-5.3p1/debian/openssh-server.upstart openssh-5.3p1/debian/openssh-server.upstart --- openssh-5.3p1/debian/openssh-server.upstart 2010-05-18 20:00:23.000000000 +0300 +++ openssh-5.3p1/debian/openssh-server.upstart 2010-12-28 21:04:13.000000000 +0200 @@ -7,7 +7,6 @@ start on filesystem stop on runlevel S -expect fork respawn respawn limit 10 5 umask 022 @@ -24,4 +23,4 @@ # if you used to set SSHD_OPTS in /etc/default/ssh, you can change the # 'exec' line here instead -exec /usr/sbin/sshd +exec /usr/sbin/sshd -D