diff options
author | Colin Watson <cjwatson@debian.org> | 2006-05-17 22:25:26 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2006-05-17 22:25:26 +0000 |
commit | 408d0db0b346043ae190f5e353c72d66e052bcec (patch) | |
tree | 90b8da203abc562043577f2720ac03a19f7619d3 /debian | |
parent | cba2418590415b8905eb906832a6929e3df04b8d (diff) |
* On '/etc/init.d/ssh restart', create /var/run/sshd before checking the
server configuration, as otherwise 'sshd -t' will complain about the
lack of /var/run/sshd (closes: https://launchpad.net/bugs/45234).
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | debian/openssh-server.init | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 1021e35a0..a85895cba 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,6 +1,9 @@ | |||
1 | openssh (1:4.3p2-2) UNRELEASED; urgency=low | 1 | openssh (1:4.3p2-2) UNRELEASED; urgency=low |
2 | 2 | ||
3 | * Include commented-out pam_access example in /etc/pam.d/ssh. | 3 | * Include commented-out pam_access example in /etc/pam.d/ssh. |
4 | * On '/etc/init.d/ssh restart', create /var/run/sshd before checking the | ||
5 | server configuration, as otherwise 'sshd -t' will complain about the | ||
6 | lack of /var/run/sshd (closes: https://launchpad.net/bugs/45234). | ||
4 | * debconf template translations: | 7 | * debconf template translations: |
5 | - Update Russian (thanks, Yuriy Talakan'; closes: #367143). | 8 | - Update Russian (thanks, Yuriy Talakan'; closes: #367143). |
6 | - Update Czech (thanks, Miroslav Kure; closes: #367161). | 9 | - Update Czech (thanks, Miroslav Kure; closes: #367161). |
diff --git a/debian/openssh-server.init b/debian/openssh-server.init index 552330422..60d974f5d 100644 --- a/debian/openssh-server.init +++ b/debian/openssh-server.init | |||
@@ -57,11 +57,11 @@ case "$1" in | |||
57 | ;; | 57 | ;; |
58 | 58 | ||
59 | restart) | 59 | restart) |
60 | check_privsep_dir | ||
60 | check_config | 61 | check_config |
61 | echo -n "Restarting OpenBSD Secure Shell server: sshd" | 62 | echo -n "Restarting OpenBSD Secure Shell server: sshd" |
62 | start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile /var/run/sshd.pid | 63 | start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile /var/run/sshd.pid |
63 | check_for_no_start | 64 | check_for_no_start |
64 | check_privsep_dir | ||
65 | start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS | 65 | start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS |
66 | echo "." | 66 | echo "." |
67 | ;; | 67 | ;; |