From cfc2556c6b2f2dd741fd0ede535459a1203609ab Mon Sep 17 00:00:00 2001
From: Jan Zeleny <jzeleny@fedoraproject.org>
Date: Jul 01 2010 09:51:14 +0000
Subject: another shot at previous fix


---

diff --git a/openldap.spec b/openldap.spec
index c420d6b..1c46a60 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 6%{?dist}
+Release: 9%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -192,7 +192,7 @@ ln -sf libslapd_db.so ${dbdir}/%{_lib}/${subdir}/libdb.so
 popd
 
 export CPPFLAGS="-I${dbdir}/include"
-export CFLAGS="$CPPFLAGS $RPM_OPT_FLAGS -D_REENTRANT -fPIC -D_GNU_SOURCE"
+export CFLAGS="$CPPFLAGS $RPM_OPT_FLAGS -D_REENTRANT -DLDAP_CONNECTIONLESS -fPIC -D_GNU_SOURCE"
 export LDFLAGS="-L${dbdir}/%{_lib}"
 export LD_LIBRARY_PATH=${dbdir}/%{_lib}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
 
@@ -485,7 +485,9 @@ fi
 # If there's a /var/lib/ldap/need_db_upgrade file, run db_upgrade and delete it.
 # It was created by the % pre above.
 if [ -f /var/lib/ldap/need_db_upgrade ]; then
-    /sbin/runuser -m -s /usr/sbin/slapd_db_upgrade -- "ldap"  -h /var/lib/ldap /var/lib/ldap/*.bdb
+	if ls /var/lib/ldap/*.bdb > /dev/null 2>&1; then
+		/sbin/runuser -m -s /usr/sbin/slapd_db_upgrade -- "ldap"  -h /var/lib/ldap /var/lib/ldap/*.bdb
+	fi
     /sbin/runuser -m -s /usr/sbin/slapd_db_checkpoint -- "ldap" -h /var/lib/ldap -1
     rm -f /var/lib/ldap/need_db_upgrade
 fi
@@ -527,6 +529,7 @@ EOF
     chmod -R 000 %{_sysconfdir}/openldap/slapd.d
     chmod -R u+rwX %{_sysconfdir}/openldap/slapd.d
     rm -f %{_sysconfdir}/openldap/slapd.conf
+	rm -f %{_sharedstatedir}/ldap/__db* %{_sharedstatedir}/ldap/alock
 fi
 
 
@@ -631,6 +634,16 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Thu Jul 01 2010 Jan Zeleny <jzeleny@redhat.com> - 2.4.21-9
+- another shot at previous fix
+
+* Wed Jun 30 2010 Jan Zeleny <jzeleny@redhat.com> - 2.4.21-8
+- fixed issue with owner of /usr/lib/ldap/__db.* (#609523)
+
+* Thu May 27 2010 Jan Zeleny <jzeleny@redhat.com> - 2.4.21-7
+- updated autofs schema (#587722)
+- openldap built with conectionless support (#587722)
+
 * Fri Mar 19 2010 Jan Zeleny <jzeleny@redhat.com> - 2.4.21-6
 - moved slapd to start earlier during boot sequence