--- /usr/portage/net-nds/openldap/files/slapd-initd2	2010-04-11 17:14:48.000000000 +0200
+++ /etc/init.d/slapd	2011-07-28 09:48:30.710000522 +0200
@@ -9,14 +9,25 @@
 	provide ldap
 }
 
+checkconfig() {
+	if ! [ -f /etc/${SVCNAME}/slapd.conf ] ; then
+		eerror "Configuration file /etc/${SVCNAME}/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/${SVCNAME}/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 $?
 }