summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xcontrib/redhat/sshd.init8
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 @@
120100207 120130208
2 - (djm) [contrib/redhat/sshd.init] treat RETVAL as an integer;
3 patch from Iain Morgan in bz#2059
4
520130207
2 - (djm) [configure.ac] Don't probe seccomp capability of running kernel 6 - (djm) [configure.ac] Don't probe seccomp capability of running kernel
3 at configure time; the seccomp sandbox will fall back to rlimit at 7 at configure time; the seccomp sandbox will fall back to rlimit at
4 runtime anyway. Patch from plautrba AT redhat.com in bz#2011 8 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()
29{ 29{
30 $SSHD -t 30 $SSHD -t
31 RETVAL=$? 31 RETVAL=$?
32 if [ ! "$RETVAL" = 0 ]; then 32 if [ $RETVAL -ne 0 ]; then
33 failure $"Configuration file or keys are invalid" 33 failure $"Configuration file or keys are invalid"
34 echo 34 echo
35 fi 35 fi
@@ -49,7 +49,7 @@ start()
49 echo -n $"Starting $prog:" 49 echo -n $"Starting $prog:"
50 $SSHD $OPTIONS && success || failure 50 $SSHD $OPTIONS && success || failure
51 RETVAL=$? 51 RETVAL=$?
52 [ "$RETVAL" = 0 ] && touch /var/lock/subsys/sshd 52 [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sshd
53 echo 53 echo
54} 54}
55 55
@@ -58,7 +58,7 @@ stop()
58 echo -n $"Stopping $prog:" 58 echo -n $"Stopping $prog:"
59 killproc $SSHD -TERM 59 killproc $SSHD -TERM
60 RETVAL=$? 60 RETVAL=$?
61 [ "$RETVAL" = 0 ] && rm -f /var/lock/subsys/sshd 61 [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sshd
62 echo 62 echo
63} 63}
64 64
@@ -87,7 +87,7 @@ case "$1" in
87 condrestart) 87 condrestart)
88 if [ -f /var/lock/subsys/sshd ] ; then 88 if [ -f /var/lock/subsys/sshd ] ; then
89 do_restart_sanity_check 89 do_restart_sanity_check
90 if [ "$RETVAL" = 0 ] ; then 90 if [ $RETVAL -eq 0 ] ; then
91 stop 91 stop
92 # avoid race 92 # avoid race
93 sleep 3 93 sleep 3