diff options
author | Colin Watson <cjwatson@debian.org> | 2009-10-04 20:36:53 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-10-04 20:36:53 +0000 |
commit | 8b7c3010b06f4deab4cb60841468477083931a88 (patch) | |
tree | 280fd476a993dd7df49312af88b5d1ed6bfd4049 /debian | |
parent | f93c88928627afc70fd26c2643557343c4dd80d9 (diff) |
Pass $SSHD_OPTS when checking configuration too (thanks, "sobtwmxt";
closes: #548662).
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/openssh-server.init | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 4ec77e6a3..15477a3df 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -5,6 +5,8 @@ openssh (1:5.1p1-8) UNRELEASED; urgency=low | |||
5 | * Build-depend on libselinux1-dev on sh4 too (thanks, Nobuhiro Iwamatsu; | 5 | * Build-depend on libselinux1-dev on sh4 too (thanks, Nobuhiro Iwamatsu; |
6 | closes: #547103). | 6 | closes: #547103). |
7 | * Fix grammar in if-up script (closes: #549128). | 7 | * Fix grammar in if-up script (closes: #549128). |
8 | * Pass $SSHD_OPTS when checking configuration too (thanks, "sobtwmxt"; | ||
9 | closes: #548662). | ||
8 | 10 | ||
9 | -- Colin Watson <cjwatson@debian.org> Fri, 28 Aug 2009 09:06:32 +0100 | 11 | -- Colin Watson <cjwatson@debian.org> Fri, 28 Aug 2009 09:06:32 +0100 |
10 | 12 | ||
diff --git a/debian/openssh-server.init b/debian/openssh-server.init index 70cded948..07b517260 100644 --- a/debian/openssh-server.init +++ b/debian/openssh-server.init | |||
@@ -75,7 +75,7 @@ check_privsep_dir() { | |||
75 | 75 | ||
76 | check_config() { | 76 | check_config() { |
77 | if [ ! -e /etc/ssh/sshd_not_to_be_run ]; then | 77 | if [ ! -e /etc/ssh/sshd_not_to_be_run ]; then |
78 | /usr/sbin/sshd -t || exit 1 | 78 | /usr/sbin/sshd $SSHD_OPTS -t || exit 1 |
79 | fi | 79 | fi |
80 | } | 80 | } |
81 | 81 | ||