- rel. 2 for Ra, rel. 3 for Ac

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

diff --git a/courier-imap-pop3.init b/courier-imap-pop3.init
index 4f6538f75196626beed055fee5ca5b9b196e1e1c..20f872bd63ef4906765619c8543ad1bc72514ada 100644 (file)
--- a/courier-imap-pop3.init
+++ b/courier-imap-pop3.init
@@ -13,7 +13,7 @@
 ADDRESS=0.0.0.0
 MAXPERIP=4
 MAXDAEMONS=40
-MAILDIR="Maildir"
+MAILDIR="Mail/Maildir"
 TCPDOPTS=
 POP3DSSLSTART="no"
 
@@ -22,7 +22,7 @@ POP3DSSLSTART="no"
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network -a != stop -a != status ]; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
                msg_network_down "Courier POP3"
                exit 1
        fi
@@ -53,7 +53,7 @@ case "$1" in
                        `sed -n '/^#/d;/=/p' </etc/sysconfig/courier-pop3 | \
                        sed 's/=.*//;s/^/export /;s/$/;/'` \
                        /usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
-                       -stderrlogger=/usr/lib/courier-imap/courierlogger \
+                       -stderrlogger=/usr/sbin/courierlogger \
                        -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
                        -pid=/var/run/pop3d.pid $TCPDOPTS 110 /usr/sbin/pop3login \
                        /usr/lib/courier-imap/authlib/authdaemon /usr/bin/pop3d $MAILDIR"
@@ -71,7 +71,7 @@ case "$1" in
                                `sed -n '/^#/d;/=/p' </etc/sysconfig/courier-pop3 | \
                                sed 's/=.*//;s/^/export /;s/$/;/'`
                                /usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
-                               -stderrlogger=/usr/lib/courier-imap/courierlogger \
+                               -stderrlogger=/usr/sbin/courierlogger \
                                -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
                                -pid=/var/run/pop3d-ssl.pid $TCPDOPTS \
                                995 /usr/bin/couriertls -server -tcpd \