- config is not needed here, no vars from config used and .rc reads config by itself

Changed files:
    courier-imap-pop3-ssl.init -> 1.3
    courier-imap-pop3.init -> 1.17
    courier-imap-ssl.init -> 1.4
    courier-imap.init -> 1.23

diff --git a/courier-imap-pop3-ssl.init b/courier-imap-pop3-ssl.init
index b5e3226836548ba699cc450c630abeb9357a3912..9300a5ff2464c5e586b4a5b03ab92d7e0d6e6289 100644 (file)
--- a/courier-imap-pop3-ssl.init
+++ b/courier-imap-pop3-ssl.init
@@ -34,7 +34,6 @@ start)
                        msg_starting "pop3d-ssl cert generation"
                        daemon $sbindir/mkpop3dcert
                fi
-               . $sysconfdir/pop3d-ssl
                msg_starting pop3d-ssl
                daemon $libexecdir/pop3d-ssl.rc start
                RETVAL=$?
@@ -45,7 +44,6 @@ start)
 ;;
 stop)
        if [ -f /var/lock/subsys/courier-pop3-ssl ]; then
-               . $sysconfdir/pop3d-ssl
                msg_stopping pop3d-ssl
                daemon $libexecdir/pop3d-ssl.rc stop
                RETVAL=$?

diff --git a/courier-imap-pop3.init b/courier-imap-pop3.init
index 0b8b8a61ac7e260ae875d89c15e44f2fbc2b76ec..84596325ad52b16320dde3b81cbd1209463338d6 100644 (file)
--- a/courier-imap-pop3.init
+++ b/courier-imap-pop3.init
@@ -30,7 +30,6 @@ case "$1" in
 start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/courier-pop3 ]; then
-               . $sysconfdir/pop3d
                msg_starting pop3d
                daemon $libexecdir/pop3d.rc start
                RETVAL=$?
@@ -41,7 +40,6 @@ start)
 ;;
 stop)
        if [ -f /var/lock/subsys/courier-pop3 ]; then
-               . $sysconfdir/pop3d
                msg_stopping pop3d
                daemon $libexecdir/pop3d.rc stop
                RETVAL=$?

diff --git a/courier-imap-ssl.init b/courier-imap-ssl.init
index 690e50bf915f734c2bfa3ddb1b229e7828ba5e88..f9427c94008247dee651ccce8bae46a165813fcf 100644 (file)
--- a/courier-imap-ssl.init
+++ b/courier-imap-ssl.init
@@ -34,7 +34,6 @@ start)
                        msg_starting "Courier IMAP SSL cert generation"
                        daemon $sbindir/mkimapdcert
                fi
-               . $sysconfdir/imapd-ssl
                msg_starting "Courier IMAP SSL"
                daemon $libexecdir/imapd-ssl.rc start
                RETVAL=$?
@@ -45,7 +44,6 @@ start)
 ;;
 stop)
        if [ -f /var/lock/subsys/courier-imap-ssl ]; then
-               . $sysconfdir/imapd-ssl
                msg_stopping "Courier IMAP SSL"
                daemon $libexecdir/imapd-ssl.rc stop
                RETVAL=$?

diff --git a/courier-imap.init b/courier-imap.init
index 5a2ea82fb61cb76d07e2293aae3f3d30262313c8..2240ffb8fa2cff48e5cadaad1282db193eb5a730 100644 (file)
--- a/courier-imap.init
+++ b/courier-imap.init
@@ -33,7 +33,6 @@ case "$1" in
 start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/courier-imap ]; then
-               . $sysconfdir/imapd
                msg_starting "Courier IMAP"
                daemon $libexecdir/imapd.rc start
                RETVAL=$?
@@ -44,7 +43,6 @@ start)
 ;;
 stop)
        if [ -f /var/lock/subsys/courier-imap ]; then
-               . $sysconfdir/imapd
                msg_stopping "Courier IMAP"
                daemon $libexecdir/imapd.rc stop
                RETVAL=$?