rpms/openldap/devel ldap.init,1.36,1.37 openldap.spec,1.159,1.160

[Jan Zeleny]

Author: jzeleny

Update of /cvs/extras/rpms/openldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25149

Modified Files:
	ldap.init openldap.spec 
Log Message:
minor corrections of init script (#571235, #570057, #573804)


Index: ldap.init
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/ldap.init,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- ldap.init	23 Nov 2009 12:51:49 -0000	1.36
+++ ldap.init	16 Mar 2010 14:47:34 -0000	1.37
@@ -113,7 +113,7 @@ function configtest() {
 	slaptestflags=""
 	dbdirs=""
     if [ -d $configdir ]; then
-	    for configfile in `ls -1 $configdir/cn\=config/olcDatabase*`; do
+	    for configfile in `ls -1 $configdir/cn\=config/olcDatabase*.ldif`; do
 		    dbdirs=$dbdirs"
 		    "`LANG=C egrep '^olcDbDirectory[[:space:]]*:[[:space:]]+[[:print:]]+$' $configfile | sed 's,^olcDbDirectory: ,,'`
 	    done
@@ -144,7 +144,15 @@ function configtest() {
 	fi
 	# Unaccessible TLS configuration files.
     if [ -d $configdir ]; then
-	    tlsconfigs=`LANG=C egrep '^olc(TLSCACertificateFile|TLSCertificateFile|TLSCertificateKeyFile)[[:space:]]*:[[:space:]]' $configdir/cn\=config.ldif | awk '{print $2}'`
+		tlsconfigs=`LANG=C awk '/^olcTLS/ {
+				while (/^olcTLS/) {
+					if (/^olc(TLSCertificateKeyFile|TLSCertificateFile|TLSCACertificateFile)[ \t]*:[\t]*/) {
+						do { printf gensub(/^ /,"",1); getline } while (/^ /)
+						printf "\n" ;
+					}
+					else break; 
+				}
+			}' $configdir/cn\=config.ldif | awk '{print $2}'`
     elif [ -f $configfile ]; then
 	    tlsconfigs=`LANG=C egrep '^(TLSCACertificateFile|TLSCertificateFile|TLSCertificateKeyFile)[[:space:]]+' $configfile | awk '{print $2}'`
     fi
@@ -243,7 +251,6 @@ case "$1" in
 	RETVAL=$?
 	;;
     restart|force-reload)
-	status -p $pidfile ${slapd} > /dev/null 2>&1 || exit 7
 	stop
 	start
 	RETVAL=$?


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- openldap.spec	24 Feb 2010 09:15:05 -0000	1.159
+++ openldap.spec	16 Mar 2010 14:47:34 -0000	1.160
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -631,6 +631,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Tue Mar 16 2010 Jan Zeleny <jzeleny at redhat.com> - 2.4.21-5
+- minor corrections of init script (#571235, #570057, #573804)
+
 * Wed Feb 24 2010 Jan Zeleny <jzeleny at redhat.com> - 2.4.21-4
 - fixed SIGSEGV when deleting data using hdb (#562227)