SOURCES: ldap.init - no more slurpd

baggins baggins at pld-linux.org
Wed Oct 31 20:55:07 CET 2007


Author: baggins                      Date: Wed Oct 31 19:55:07 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- no more slurpd

---- Files affected:
SOURCES:
   ldap.init (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: SOURCES/ldap.init
diff -u SOURCES/ldap.init:1.27 SOURCES/ldap.init:1.28
--- SOURCES/ldap.init:1.27	Thu Jul 20 17:20:47 2006
+++ SOURCES/ldap.init	Wed Oct 31 20:55:02 2007
@@ -54,14 +54,6 @@
 		SERVICE_RUN_NICE_LEVEL="$SLAPDNICE"
 		daemon slapd $ARGS
 		RETVAL=$?
-		if grep -q '^replogfile' /etc/openldap/slapd.conf; then
-			msg_starting "OpenLDAP Update Replication Daemon"
-			SERVICE_RUN_NICE_LEVEL="$SLURPNICE"
-			# slapd has /bin/false as shell, so -s must be passed to su
-			daemon --user 'slapd -s /bin/sh' slurpd
-			RET=$?
-			[ $RETVAL -eq 0 ] && RETVAL=$RET
-		fi
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ldap
 		if [ $RETVAL -eq 0 -a -S /var/run/ldapi ]; then
 			chown "$LDAPI_SOCKET_OWNER":"$LDAPI_SOCKET_GROUP" /var/run/ldapi && \
@@ -75,10 +67,6 @@
 	if [ -f /var/lock/subsys/ldap ]; then
 		msg_stopping "OpenLDAP"
 		killproc --waitforname slapd --waitfortime 300 slapd -TERM
-		if grep -q '^replogfile' /etc/openldap/slapd.conf; then
-			msg_stopping "OpenLDAP Update Replication Daemon"
-			killproc slurpd
- 		fi
 		rm -f /var/lock/subsys/ldap >/dev/null 2>&1
 	else
 		msg_not_running "OpenLDAP"
@@ -87,11 +75,6 @@
   status)
 	status slapd
 	RETVAL=$?
-	if grep -q '^replogfile' /etc/openldap/slapd.conf; then
-		status slurpd
-		RET=$?
-		[ $RETVAL -eq 0 ] && RETVAL=$RET
-	fi
 	;;
   restart|force-reload)
 	$0 stop
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ldap.init?r1=1.27&r2=1.28&f=u



More information about the pld-cvs-commit mailing list