summaryrefslogtreecommitdiffstats
path: root/saslauthd
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-08-23 15:37:21 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-08-23 15:37:21 +0100
commit2d3b0045a6146424077294b40f0c720d73af9869 (patch)
tree4622f0ecd1b001fe02019d792873e81212d01ff5 /saslauthd
parent61a8b609310264d35eaff5224c07821f53c2ea9c (diff)
downloadpykolab-2d3b0045a6146424077294b40f0c720d73af9869.tar.gz
Clause the inclusion of /etc/init.d/functions (it should exist)
Include /etc/default/$service if the file exists Both changes work towards resolving #972
Diffstat (limited to 'saslauthd')
-rw-r--r--saslauthd/kolab-saslauthd.sysvinit12
1 files changed, 9 insertions, 3 deletions
diff --git a/saslauthd/kolab-saslauthd.sysvinit b/saslauthd/kolab-saslauthd.sysvinit
index cc1715e..033bbc7 100644
--- a/saslauthd/kolab-saslauthd.sysvinit
+++ b/saslauthd/kolab-saslauthd.sysvinit
@@ -11,15 +11,17 @@
# Provides: kolab-saslauthd
# Default-Start: -
# Default-Stop: 0 1 2 6
-# Required-Start: $local_fs $network
-# Required-Stop: $local_fs $network
+# Required-Start: $remote_fs $local_fs $network
+# Required-Stop: $remote_fs $local_fs $network
# Short-Description: Start/Stop the Kolab SASL authentication daemon
# Description: The Kolab saslauthd is a server process which handles \
# authentication requests on behalf of the cyrus-sasl library.
### END INIT INFO
# Source function library.
-. /etc/init.d/functions
+if [ -f /etc/init.d/functions ]; then
+ . /etc/init.d/functions
+fi
# Source our configuration file for these variables.
SOCKETDIR=/var/run/saslauthd
@@ -29,6 +31,10 @@ if [ -f /etc/sysconfig/kolab-saslauthd ] ; then
. /etc/sysconfig/kolab-saslauthd
fi
+if [ -f /etc/default/kolab-saslauthd ]; then
+ . /etc/default/kolab-saslauthd
+fi
+
RETVAL=0
# Set up some common variables before we launch into what might be