diff options
author | Colin Watson <cjwatson@debian.org> | 2003-09-02 22:21:07 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2003-09-02 22:21:07 +0000 |
commit | 2e574ee6e5d467c87dd0b310187420e59e4d2016 (patch) | |
tree | 7df9ea9a83dc5379fdb6e58959193d58e6ed4276 /debian | |
parent | c60424d464efa5671ee3ff2bd5836b22d0c091f5 (diff) |
Don't run 'sshd -t' in init script if the server isn't to be run (#197576).
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/init | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 20f685d5d..eb3884e44 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -3,6 +3,8 @@ openssh (1:3.6.1p2-6) UNRELEASED; urgency=low | |||
3 | * Use a more CVS-friendly means of setting SSH_VERSION. | 3 | * Use a more CVS-friendly means of setting SSH_VERSION. |
4 | * Update Brazilian Portuguese debconf template translation (thanks, Andre | 4 | * Update Brazilian Portuguese debconf template translation (thanks, Andre |
5 | Luis Lopes; closes: #208036). | 5 | Luis Lopes; closes: #208036). |
6 | * Don't run 'sshd -t' in init script if the server isn't to be run | ||
7 | (closes: #197576). | ||
6 | 8 | ||
7 | -- Colin Watson <cjwatson@debian.org> Mon, 1 Sep 2003 23:56:57 +0100 | 9 | -- Colin Watson <cjwatson@debian.org> Mon, 1 Sep 2003 23:56:57 +0100 |
8 | 10 | ||
diff --git a/debian/init b/debian/init index 0eddf722e..641b9eff5 100644 --- a/debian/init +++ b/debian/init | |||
@@ -27,7 +27,9 @@ check_privsep_dir() { | |||
27 | } | 27 | } |
28 | 28 | ||
29 | check_config() { | 29 | check_config() { |
30 | if [ ! -e /etc/ssh/sshd_not_to_be_run ]; then | ||
30 | /usr/sbin/sshd -t || exit 1 | 31 | /usr/sbin/sshd -t || exit 1 |
32 | fi | ||
31 | } | 33 | } |
32 | 34 | ||
33 | export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" | 35 | export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" |