rpms/openldap/devel ldap.init,1.21,1.22 openldap.spec,1.70,1.71

[Jan Šafránek (jsafrane)]

Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16871

Modified Files:
	ldap.init openldap.spec 
Log Message:
start slupd for each replicated database
Resolves: #210155


Index: ldap.init
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/ldap.init,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ldap.init	22 May 2007 15:48:20 -0000	1.21
+++ ldap.init	24 May 2007 10:10:05 -0000	1.22
@@ -156,9 +156,6 @@
 	if test x$SLAPD_LDAPI = xyes ; then
 	    harg="$harg ldapi:///"
 	fi
-	if test -z "$wrapper" ; then
-	    return 1
-	fi
 	# Start daemons.
 	echo -n $"Starting $prog: "
 	daemon --check=$prog ${slapd} -h "\"$harg\"" -u ${user} $OPTIONS $SLAPD_OPTIONS 
@@ -167,10 +164,22 @@
 	if [ $RETVAL -eq 0 ]; then
 	    if grep -q "^replogfile" /etc/openldap/slapd.conf; then
 		prog=`basename ${slurpd}`
-		echo -n $"Starting $prog: "
-		daemon ${slurpd} $OPTIONS $SLURPD_OPTIONS
-		RETVAL=$?
-		echo
+		i=1;
+		for replogfile in `grep  "^replogfile" /etc/openldap/slapd.conf`
+		do
+		    if [ "$replogfile" != "replogfile" ]
+		    then
+			echo -n $"Starting $prog: "
+			daemon ${slurpd} -r $replogfile -n $i
+			# make the return value nozero if any of the slurpd failed
+			RET=$?
+			if [ $RET -ne 0 ] ; then
+			    RETVAL=$RET
+			fi
+			i=$[i+1]
+			echo
+		    fi
+		done
 	    fi
 	fi
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ldap


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- openldap.spec	24 May 2007 09:32:33 -0000	1.70
+++ openldap.spec	24 May 2007 10:10:05 -0000	1.71
@@ -736,6 +736,8 @@
   (bz#201183)
 - sort the hosts by adders, preventing duplicities
   in migrate*nis*.pl (bz#201540)
+- start slupd for each replicated database (bz#210155)
+
 
 * Mon Apr 23 2007 Jan Safranek <jsafranek at redhat.com> 2.3.34-2%{?dist}
 - slapadd during package update is now quiet (bz#224581)