- cleaning

Changed files:
    courier-imap-authdaemon.init -> 1.6
    courier-imap-pop3.init -> 1.7
    courier-imap.init -> 1.11

diff --git a/courier-imap-authdaemon.init b/courier-imap-authdaemon.init
index 122b1a58016746c8eb4e1136abe526c0ad4e5999..37a53cc4758173a41ed183e225e56c1e1694822c 100644 (file)
--- a/courier-imap-authdaemon.init
+++ b/courier-imap-authdaemon.init
@@ -15,9 +15,13 @@ METHOD="plain"
 [ -f /etc/sysconfig/authdaemon ] && . /etc/sysconfig/authdaemon
 
 # Check that networking is up.
-if is_no "${NETWORKING}" ; then
-       msg_network_down "Courier IMAP - Authdaemon"
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network ]; then
+               msg_network_down "Courier IMAP - Authdaemon"
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 # See how we were called.
@@ -27,8 +31,8 @@ case "$1" in
        if [ ! -f /var/lock/subsys/authdaemon ]; then
                msg_starting "Courier IMAP - Authdaemon"
                daemon /usr/lib/courier-imap/authlib/authdaemond.$METHOD start
-                RETVAL=$?
-                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/authdaemon
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/authdaemon
        else
                msg_already_running "Courier IMAP - Authdaemon"
                exit 1
@@ -48,19 +52,19 @@ case "$1" in
   restart|reload)
        # restart related services, if running..
        if [ -f /var/lock/subsys/courier-mta -a \
-            -x /etc/rc.d/init.d/courier-mta ]; then
-           /etc/rc.d/init.d/courier-mta stop
-           crun=1
+          -x /etc/rc.d/init.d/courier-mta ]; then
+               /etc/rc.d/init.d/courier-mta stop
+               crun=1
        fi
        if [ -f /var/lock/subsys/courier-imap -a \
-            -x /etc/rc.d/init.d/courier-imap ]; then
-           /etc/rc.d/init.d/courier-imap stop
-           imaprun=1
+          -x /etc/rc.d/init.d/courier-imap ]; then
+               /etc/rc.d/init.d/courier-imap stop
+               imaprun=1
        fi
        if [ -f /var/lock/subsys/courier-pop3 -a \
-            -x /etc/rc.d/init.d/courier-pop3 ]; then
-           /etc/rc.d/init.d/courier-pop3 stop
-           poprun=1
+          -x /etc/rc.d/init.d/courier-pop3 ]; then
+               /etc/rc.d/init.d/courier-pop3 stop
+               poprun=1
        fi
        $0 stop
        $0 start

diff --git a/courier-imap-pop3.init b/courier-imap-pop3.init
index 515e2a3d92c0e3c0fcd2f2cec673805ee7b52a4e..9f2ac330c60c3b988ae834e42e69a485977f24a4 100644 (file)
--- a/courier-imap-pop3.init
+++ b/courier-imap-pop3.init
@@ -21,9 +21,13 @@ POP3DSSLSTART="no"
 [ -f /etc/sysconfig/courier-pop3 ] && . /etc/sysconfig/courier-pop3
 
 # Check that networking is up.
-if is_no "${NETWORKING}" ; then
-       msg_network_down "Courier POP3"
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network ]; then
+               msg_network_down "Courier POP3"
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 # See how we were called.
@@ -33,14 +37,14 @@ case "$1" in
        if [ ! -f /var/lock/subsys/courier-pop3 ]; then
                # start authdaemon, if not running..
                if [ ! -f /var/lock/subsys/authdaemon -a \
-                    -x /etc/rc.d/init.d/authdaemon ]; then
-                           /etc/rc.d/init.d/authdaemon start
-                           RETVAL=$?
-                           if [ $RETVAL -ne 0 ]; then
-                                   msg_starting "Courier POP3"
-                                   fail
-                                   exit 1
-                           fi
+                  -x /etc/rc.d/init.d/authdaemon ]; then
+                       /etc/rc.d/init.d/authdaemon start
+                       RETVAL=$?
+                       if [ $RETVAL -ne 0 ]; then
+                               msg_starting "Courier POP3"
+                               fail
+                               exit 1
+                       fi
                fi
                msg_starting "Courier POP3"
                /usr/bin/env - /bin/sh -c " . /etc/sysconfig/courier-pop3 ; \

diff --git a/courier-imap.init b/courier-imap.init
index 024f41334a51cd435a3b4f1bc6b864861c450d32..1905c0409a9538bbdb5ed2b781470e433486f97e 100644 (file)
--- a/courier-imap.init
+++ b/courier-imap.init
@@ -21,9 +21,13 @@ IMAPDSSLSTART="no"
 [ -f /etc/sysconfig/courier-imap ] && . /etc/sysconfig/courier-imap
 
 # Check that networking is up.
-if is_no "${NETWORKING}" ; then
-       msg_network_down "Courier IMAP"
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network ]; then
+               msg_network_down "Courier IMAP"
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 # See how we were called.
@@ -33,14 +37,14 @@ case "$1" in
        if [ ! -f /var/lock/subsys/courier-imap ]; then
                # start authdaemon, if not running..
                if [ ! -f /var/lock/subsys/authdaemon -a \
-                    -x /etc/rc.d/init.d/authdaemon ]; then
-                           /etc/rc.d/init.d/authdaemon start
-                           RETVAL=$?
-                           if [ $RETVAL -ne 0 ]; then
-                                   msg_starting "Courier IMAP"
-                                   fail
-                                   exit 1
-                           fi
+                  -x /etc/rc.d/init.d/authdaemon ]; then
+                       /etc/rc.d/init.d/authdaemon start
+                       RETVAL=$?
+                       if [ $RETVAL -ne 0 ]; then
+                               msg_starting "Courier IMAP"
+                               fail
+                               exit 1
+                       fi
                fi
                msg_starting "Courier IMAP"
                ulimit -d $IMAP_ULIMITD