summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rw-r--r--debian/control2
-rw-r--r--debian/openssh-server.if-up5
3 files changed, 11 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 049d0740b..a58cca063 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ openssh (1:5.1p1-5) UNRELEASED; urgency=low
3 * Backport from upstream CVS (Markus Friedl): 3 * Backport from upstream CVS (Markus Friedl):
4 - packet_disconnect() on padding error, too. Should reduce the success 4 - packet_disconnect() on padding error, too. Should reduce the success
5 probability for the CPNI-957037 Plaintext Recovery Attack to 2^-18. 5 probability for the CPNI-957037 Plaintext Recovery Attack to 2^-18.
6 * Check that /var/run/sshd.pid exists and that the process ID listed there
7 corresponds to sshd before running '/etc/init.d/ssh reload' from if-up
8 script; SIGHUP is racy if called at boot before sshd has a chance to
9 install its signal handler, but fortunately the pid file is written
10 after that which lets us avoid the race (closes: #502444).
6 11
7 -- Colin Watson <cjwatson@debian.org> Mon, 01 Dec 2008 16:13:14 +0000 12 -- Colin Watson <cjwatson@debian.org> Mon, 01 Dec 2008 16:13:14 +0000
8 13
diff --git a/debian/control b/debian/control
index 27b27e756..d87025778 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Description: secure shell client, an rlogin/rsh/rcp replacement
37Package: openssh-server 37Package: openssh-server
38Priority: optional 38Priority: optional
39Architecture: any 39Architecture: any
40Depends: ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 3.2-13), libssl0.9.8 (>= 0.9.8g-9), openssh-blacklist 40Depends: ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 3.2-13), libssl0.9.8 (>= 0.9.8g-9), openssh-blacklist, procps
41Recommends: xauth, openssh-blacklist-extra 41Recommends: xauth, openssh-blacklist-extra
42Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) 42Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7)
43Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 43Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5
diff --git a/debian/openssh-server.if-up b/debian/openssh-server.if-up
index c44a4d257..9b2140352 100644
--- a/debian/openssh-server.if-up
+++ b/debian/openssh-server.if-up
@@ -25,6 +25,11 @@ if [ ! -e /usr/sbin/sshd ]; then
25 exit 0 25 exit 0
26fi 26fi
27 27
28if [ ! -f /var/run/sshd.pid ] || \
29 [ "$(ps -p "$(cat /var/run/sshd.pid)" -o comm=)" = sshd ]; then
30 exit 0
31fi
32
28/etc/init.d/ssh reload >/dev/null 2>&1 || true 33/etc/init.d/ssh reload >/dev/null 2>&1 || true
29 34
30exit 0 35exit 0