- removed authpgsql.8 from -common (present in -authpgsql); release 3

[packages/courier-imap.git] / courier-imap-pop3.init

diff --git a/courier-imap-pop3.init b/courier-imap-pop3.init
index 01fd066f3ba753c7616c6484682322bc933afea5..380c4e637dc57b8294b6260dc222992900c5b956 100644 (file)
--- a/courier-imap-pop3.init
+++ b/courier-imap-pop3.init
@@ -22,7 +22,7 @@ POP3DSSLSTART="no"
 
 # Check that networking is up.
 if is_no "${NETWORKING}" ; then
-       msg_Network_Down "Courier IMAP - POP3"
+       msg_network_down "Courier IMAP - POP3"
        exit 1
 fi
 
@@ -32,7 +32,6 @@ case "$1" in
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/courier-imap-pop3 ]; then
                msg_starting "Courier IMAP - POP3"
-               ulimit -d $IMAP_ULIMITD
                /usr/bin/env - /bin/sh -c " . /etc/sysconfig/courier-imap-pop3 ; \
                        POP3_STARTTLS=$POP3DSTARTTLS ; export POP3_STARTTLS ; \
                        `sed -n '/^#/d;/=/p' </etc/sysconfig/courier-imap-pop3 | \
@@ -49,9 +48,9 @@ case "$1" in
                        fail
                fi
 
-               msg_starting "Courier IMAP - POP3 (SSL)"
                
                if is_yes "$POP3DSSLSTART"; then
+                       msg_starting "Courier IMAP - POP3 (SSL)"
                        /usr/bin/env - /bin/sh -c " . /etc/sysconfig/courier-imap-pop3 ; \
                                POP3_TLS=1; export POP3_TLS; \
                                `sed -n '/^#/d;/=/p' </etc/sysconfig/courier-imap-pop3 | \
@@ -63,16 +62,16 @@ case "$1" in
                                995 /usr/bin/couriertls -server -tcpd \
                                /usr/sbin/pop3login /usr/lib/courier-imap/authlib/authdaemon \
                                /usr/bin/pop3d $MAILDIR"
-               fi
-               RETVAL=$?
-               if [ $RETVAL -eq 0 ]; then
-                       ok
-               else
-                       fail
+                       RETVAL=$?
+                       if [ $RETVAL -eq 0 ]; then
+                               ok
+                       else
+                               fail
+                       fi
                fi
                touch /var/lock/subsys/courier-imap-pop3
        else
-               msg_Already_Running "Courier IMAP - POP3"
+               msg_already_running "Courier IMAP - POP3"
                exit 1
        fi
        ;;
@@ -99,7 +98,7 @@ case "$1" in
        status couriertcpd
        ;;
   *)
-       msg_Usage "$0 {start|stop|restart|reload|status}"
+       msg_usage "$0 {start|stop|restart|reload|status}"
        exit 1
 esac