[patch] Updated patch for init script

slapdinit.patch (text/plain), 1.33 KB, created by Janos Pasztor on 2011-07-28 12:30:37 UTC

--- /usr/portage/net-nds/openldap/files/slapd-initd2	2010-04-11 17:14:48.000000000 +0200
+++ /etc/init.d/slapd	2011-07-28 14:19:03.033000524 +0200
@@ -3,20 +3,37 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd2,v 1.1 2010/04/11 15:14:48 jokey Exp $
 
+if [ "${SVCNAME}" != "slapd" ] ; then
+	INSTANCE="openldap.${SVCNAME#*.}"
+else
+	INSTANCE="openldap"
+fi
+
 depend() {
 	need net
 	before dbus hald avahi-daemon
 	provide ldap
 }
 
+checkconfig() {
+	if ! [ -f /etc/${INSTANCE}/slapd.conf ] ; then
+		eerror "Configuration file /etc/${INSTANCE}/slapd.conf does not exist!"
+		return 1
+	fi
+	return 0
+}
+
 start() {
+
+	checkconfig || return 1
+
 	ebegin "Starting ldap-server"
-	eval start-stop-daemon --start --pidfile /var/run/openldap/slapd.pid --exec /usr/lib/openldap/slapd -- -u ldap -g ldap "${OPTS}"
+	eval start-stop-daemon --start --pidfile /var/run/openldap/${SVCNAME}.pid --exec /usr/lib64/openldap/slapd -- -u ldap -g ldap -f /etc/${INSTANCE}/slapd.conf "${OPTS}"
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping ldap-server"
-	start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/slapd.pid 
+	start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/${SVCNAME}.pid 
 	eend $?
 }