summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-02-15 10:23:44 +1100
committerDamien Miller <djm@mindrot.org>2013-02-15 10:23:44 +1100
commit91edc1ce2b4a7038432efbcbbfc0b1cb2fb85d0d (patch)
tree67ca8cecb622701d068fc2d467912ab9d60d49f0
parent57f92185288e0101fe9c3f3dfa29ea1619da8354 (diff)
- (djm) [contrib/suse/rc.sshd] Use SSHD_BIN consistently; bz#2056 from
Iain Morgan
-rw-r--r--ChangeLog4
-rw-r--r--contrib/suse/rc.sshd8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c6162496e..997982e61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120130215
2 - (djm) [contrib/suse/rc.sshd] Use SSHD_BIN consistently; bz#2056 from
3 Iain Morgan
4
120130214 520130214
2 - (djm) [regress/krl.sh] Don't use ecdsa keys in environment that lack ECC. 6 - (djm) [regress/krl.sh] Don't use ecdsa keys in environment that lack ECC.
3 - (djm) [regress/krl.sh] typo; found by Iain Morgan 7 - (djm) [regress/krl.sh] typo; found by Iain Morgan
diff --git a/contrib/suse/rc.sshd b/contrib/suse/rc.sshd
index 4a3bc41db..28f28e41d 100644
--- a/contrib/suse/rc.sshd
+++ b/contrib/suse/rc.sshd
@@ -49,7 +49,7 @@ case "$1" in
49 ## Start daemon with startproc(8). If this fails 49 ## Start daemon with startproc(8). If this fails
50 ## the echo return value is set appropriate. 50 ## the echo return value is set appropriate.
51 51
52 startproc -f -p $SSHD_PIDFILE /usr/sbin/sshd $SSHD_OPTS -o "PidFile=$SSHD_PIDFILE" 52 startproc -f -p $SSHD_PIDFILE $SSHD_BIN $SSHD_OPTS -o "PidFile=$SSHD_PIDFILE"
53 53
54 # Remember status and be verbose 54 # Remember status and be verbose
55 rc_status -v 55 rc_status -v
@@ -59,7 +59,7 @@ case "$1" in
59 ## Stop daemon with killproc(8) and if this fails 59 ## Stop daemon with killproc(8) and if this fails
60 ## set echo the echo return value. 60 ## set echo the echo return value.
61 61
62 killproc -p $SSHD_PIDFILE -TERM /usr/sbin/sshd 62 killproc -p $SSHD_PIDFILE -TERM $SSHD_BIN
63 63
64 # Remember status and be verbose 64 # Remember status and be verbose
65 rc_status -v 65 rc_status -v
@@ -87,7 +87,7 @@ case "$1" in
87 87
88 echo -n "Reload service sshd" 88 echo -n "Reload service sshd"
89 89
90 killproc -p $SSHD_PIDFILE -HUP /usr/sbin/sshd 90 killproc -p $SSHD_PIDFILE -HUP $SSHD_BIN
91 91
92 rc_status -v 92 rc_status -v
93 93
@@ -103,7 +103,7 @@ case "$1" in
103 # 2 - service dead, but /var/lock/ lock file exists 103 # 2 - service dead, but /var/lock/ lock file exists
104 # 3 - service not running 104 # 3 - service not running
105 105
106 checkproc -p $SSHD_PIDFILE /usr/sbin/sshd 106 checkproc -p $SSHD_PIDFILE $SSHD_BIN
107 107
108 rc_status -v 108 rc_status -v
109 ;; 109 ;;