2 files changed, 9 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 53785de6a..6c569b81d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-20100207
+20130208
+ - (djm) [contrib/redhat/sshd.init] treat RETVAL as an integer;
+   patch from Iain Morgan in bz#2059
+
+20130207
  - (djm) [configure.ac] Don't probe seccomp capability of running kernel
    at configure time; the seccomp sandbox will fall back to rlimit at
    runtime anyway. Patch from plautrba AT redhat.com in bz#2011
diff --git a/contrib/redhat/sshd.init b/contrib/redhat/sshd.init
index e9a751796..40c8dfd9f 100755
--- a/contrib/redhat/sshd.init
+++ b/contrib/redhat/sshd.init
@@ -29,7 +29,7 @@ do_restart_sanity_check()
 {
         $SSHD -t
         RETVAL=$?
-        if [ ! "$RETVAL" = 0 ]; then
+        if [ $RETVAL -ne 0 ]; then
                 failure $"Configuration file or keys are invalid"
                 echo
         fi
@@ -49,7 +49,7 @@ start()
         echo -n $"Starting $prog:"
         $SSHD $OPTIONS && success || failure
         RETVAL=$?
-        [ "$RETVAL" = 0 ] && touch /var/lock/subsys/sshd
+        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sshd
         echo
 }
 
@@ -58,7 +58,7 @@ stop()
         echo -n $"Stopping $prog:"
         killproc $SSHD -TERM
         RETVAL=$?
-        [ "$RETVAL" = 0 ] && rm -f /var/lock/subsys/sshd
+        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sshd
         echo
 }
 
@@ -87,7 +87,7 @@ case "$1" in
         condrestart)
                 if [ -f /var/lock/subsys/sshd ] ; then
                         do_restart_sanity_check
-                        if [ "$RETVAL" = 0 ] ; then
+                        if [ $RETVAL -eq 0 ] ; then
                                 stop
                                 # avoid race
                                 sleep 3