- (djm) [contrib/suse/rc.sshd] Use SSHD_BIN consistently; bz#2056 from

Iain Morgan
This commit is contained in:
Damien Miller 2013-02-15 10:23:44 +11:00
parent 57f9218528
commit 91edc1ce2b
2 changed files with 8 additions and 4 deletions

View File

@ -1,3 +1,7 @@
20130215
- (djm) [contrib/suse/rc.sshd] Use SSHD_BIN consistently; bz#2056 from
Iain Morgan
20130214
- (djm) [regress/krl.sh] Don't use ecdsa keys in environment that lack ECC.
- (djm) [regress/krl.sh] typo; found by Iain Morgan

View File

@ -49,7 +49,7 @@ case "$1" in
## Start daemon with startproc(8). If this fails
## the echo return value is set appropriate.
startproc -f -p $SSHD_PIDFILE /usr/sbin/sshd $SSHD_OPTS -o "PidFile=$SSHD_PIDFILE"
startproc -f -p $SSHD_PIDFILE $SSHD_BIN $SSHD_OPTS -o "PidFile=$SSHD_PIDFILE"
# Remember status and be verbose
rc_status -v
@ -59,7 +59,7 @@ case "$1" in
## Stop daemon with killproc(8) and if this fails
## set echo the echo return value.
killproc -p $SSHD_PIDFILE -TERM /usr/sbin/sshd
killproc -p $SSHD_PIDFILE -TERM $SSHD_BIN
# Remember status and be verbose
rc_status -v
@ -87,7 +87,7 @@ case "$1" in
echo -n "Reload service sshd"
killproc -p $SSHD_PIDFILE -HUP /usr/sbin/sshd
killproc -p $SSHD_PIDFILE -HUP $SSHD_BIN
rc_status -v
@ -103,7 +103,7 @@ case "$1" in
# 2 - service dead, but /var/lock/ lock file exists
# 3 - service not running
checkproc -p $SSHD_PIDFILE /usr/sbin/sshd
checkproc -p $SSHD_PIDFILE $SSHD_BIN
rc_status -v
;;