- merge from AC-branch

Changed files:
    exim.init -> 1.21

diff --git a/exim.init b/exim.init
index 03c1735da3afa22fbf053b58eb1de03471fbff7f..b6e72fecb63931f17afe637dc09d72c75ec1c929 100644 (file)
--- a/exim.init
+++ b/exim.init
@@ -74,18 +74,25 @@ case "$1" in
        status exim
        exit $?
        ;;
+  configtest)
+       exim -bV || exit $?
+       ;;
+
   reload|force-reload)
        if [ -f /var/lock/subsys/exim ]; then
-               msg_reloading Exim
-               killproc exim -HUP
-               RETVAL=$?
+               run_cmd "Checking exim configuration" exim -bV
+               if [ $? -eq 0 ]; then
+                       msg_reloading Exim
+                       killproc exim -HUP
+                       RETVAL=$?
+               fi
        else
                msg_not_running Exim
                exit 7
        fi
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|reload|force-reload|configtest|status}"
        exit 3
 esac