- LSB conformance changes

Changed files:
    courier-imap-authdaemon.init -> 1.7
    courier-imap-pop3.init -> 1.8
    courier-imap.init -> 1.12

diff --git a/courier-imap-authdaemon.init b/courier-imap-authdaemon.init
index 37a53cc4758173a41ed183e225e56c1e1694822c..a41b027170e63f4bf814d0e006bf4d9493890abc 100644 (file)
--- a/courier-imap-authdaemon.init
+++ b/courier-imap-authdaemon.init
@@ -24,6 +24,7 @@ else
        exit 0
 fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -35,21 +36,18 @@ case "$1" in
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/authdaemon
        else
                msg_already_running "Courier IMAP - Authdaemon"
-               exit 1
        fi
        ;;
   stop)
        if [ -f /var/lock/subsys/authdaemon ]; then
                msg_stopping "Courier IMAP - Authdaemon"
                daemon /usr/lib/courier-imap/authlib/authdaemond.$METHOD stop
-               RETVAL=$?
                rm -f /var/lock/subsys/authdaemon
        else
                msg_not_running "Courier IMAP - Authdaemon"
-               exit 1
        fi
        ;;
-  restart|reload)
+  restart|force-reload)
        # restart related services, if running..
        if [ -f /var/lock/subsys/courier-mta -a \
           -x /etc/rc.d/init.d/courier-mta ]; then
@@ -69,20 +67,20 @@ case "$1" in
        $0 stop
        $0 start
        RETVAL=$?
-       [[ $imaprun -eq 1 ]] && /etc/rc.d/init.d/courier-imap start
-       [[ $poprun -eq 1 ]] && /etc/rc.d/init.d/courier-pop3 start
-       [[ $crun -eq 1 ]] && /etc/rc.d/init.d/courier-mta start
+       [ $imaprun -eq 1 ] && /etc/rc.d/init.d/courier-imap start
+       [ $poprun -eq 1 ] && /etc/rc.d/init.d/courier-pop3 start
+       [ $crun -eq 1 ] && /etc/rc.d/init.d/courier-mta start
        unset crun
        unset poprun
        unset imaprun
        ;;
   status)
        status authdaemond.$METHOD
+       exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL
-

diff --git a/courier-imap-pop3.init b/courier-imap-pop3.init
index 9f2ac330c60c3b988ae834e42e69a485977f24a4..bdefc7e8437106e0c1fec0df28676cfdea581d00 100644 (file)
--- a/courier-imap-pop3.init
+++ b/courier-imap-pop3.init
@@ -30,6 +30,7 @@ else
        exit 0
 fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -63,7 +64,6 @@ case "$1" in
                        fail
                fi
 
-               
                if is_yes "$POP3DSSLSTART"; then
                        msg_starting "Courier POP3 (SSL)"
                        /usr/bin/env - /bin/sh -c " . /etc/sysconfig/courier-pop3 ; \
@@ -87,7 +87,6 @@ case "$1" in
                touch /var/lock/subsys/courier-pop3
        else
                msg_already_running "Courier POP3"
-               exit 1
        fi
        ;;
   stop)
@@ -98,24 +97,23 @@ case "$1" in
                        msg_stopping "Courier POP3 (SSL)"
                        daemon /usr/lib/courier-imap/couriertcpd -pid=/var/run/pop3d-ssl.pid -stop
                fi
-               RETVAL=$?
                rm -f /var/lock/subsys/courier-pop3
        else
                msg_not_running "Courier POP3"
-               exit 1
        fi
        ;;
-  restart|reload)
+  restart|force-reload)
        $0 stop
        $0 start
+       exit $?
        ;;
   status)
        status couriertcpd
+       exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL
-

diff --git a/courier-imap.init b/courier-imap.init
index 1905c0409a9538bbdb5ed2b781470e433486f97e..bd811796694daca0eddd76f51d93508fb220e208 100644 (file)
--- a/courier-imap.init
+++ b/courier-imap.init
@@ -30,6 +30,7 @@ else
        exit 0
 fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -47,6 +48,7 @@ case "$1" in
                        fi
                fi
                msg_starting "Courier IMAP"
+               busy
                ulimit -d $IMAP_ULIMITD
                /usr/bin/env - /bin/sh -c " . /etc/sysconfig/courier-imap ; \
                        `sed -n '/^#/d;/=/p' </etc/sysconfig/courier-imap | \
@@ -87,7 +89,6 @@ case "$1" in
                touch /var/lock/subsys/courier-imap
        else
                msg_already_running "Courier IMAP"
-               exit 1
        fi
        ;;
   stop)
@@ -98,24 +99,23 @@ case "$1" in
                        msg_stopping "Courier IMAP (SSL)"
                        daemon /usr/lib/courier-imap/couriertcpd -pid=/var/run/imapd-ssl.pid -stop
                fi
-               RETVAL=$?
                rm -f /var/lock/subsys/courier-imap
        else
                msg_not_running "Courier IMAP"
-               exit 1
        fi
        ;;
-  restart|reload)
+  restart|force-reload)
        $0 stop
        $0 start
+       exit $?
        ;;
   status)
        status couriertcpd
+       exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL
-