merge 6.2p1; reorder additions to monitor.h for easier merging in future

1 files changed, 4 insertions, 4 deletions

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
         ## 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
         ;;