rpms/openldap/F-13 autofs.schema, 1.1, 1.2 ldap.init, 1.38, 1.39 openldap.spec, 1.161, 1.162

[Jan Zeleny]

Author: jzeleny

Update of /cvs/extras/rpms/openldap/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22037

Modified Files:
	autofs.schema ldap.init openldap.spec 
Log Message:
Fixed issue with owner of /usr/lib/ldap/__db.* (#609523)
Updated autofs schema (#587722)
Openldap built with conectionless support (#587722)



Index: autofs.schema
===================================================================
RCS file: /cvs/extras/rpms/openldap/F-13/autofs.schema,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- autofs.schema	9 Sep 2004 09:28:35 -0000	1.1
+++ autofs.schema	30 Jun 2010 17:22:39 -0000	1.2
@@ -8,14 +8,14 @@
 
 # Attribute Type Definitions
 
-attributetype ( 1.3.6.1.1.1.1.25 NAME 'automountInformation'
+attributetype ( 1.3.6.1.4.1.2312.4.1.2 NAME 'automountInformation'
 	DESC 'Information used by the autofs automounter'
-	EQUALITY caseExactIA5Match
+	EQUALITY caseExactMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-objectclass ( 1.3.6.1.1.1.1.13 NAME 'automount' SUP top STRUCTURAL
+objectclass ( 1.3.6.1.4.1.2312.4.2.3 NAME 'automount' SUP top STRUCTURAL
 	DESC 'An entry in an automounter map'
-	MUST ( cn $ automountInformation )
+	MUST ( cn $ automountInformation $ objectclass )
 	MAY ( description ) )
 
 objectclass ( 1.3.6.1.4.1.2312.4.2.2 NAME 'automountMap' SUP top STRUCTURAL


Index: ldap.init
===================================================================
RCS file: /cvs/extras/rpms/openldap/F-13/ldap.init,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- ldap.init	19 Mar 2010 09:34:48 -0000	1.38
+++ ldap.init	30 Jun 2010 17:22:39 -0000	1.39
@@ -261,12 +261,12 @@ case "$1" in
 	start
 	;;
     usage)
-	echo $"Usage: $0 {start|stop|restart|status|condrestart|configtest|usage}"
+	echo $"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|configtest|usage}"
 	RETVAL=0
 	;;
     *)
-	echo $"Usage: $0 {start|stop|restart|status|condrestart|configtest|usage}"
-	RETVAL=3
+	echo $"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|configtest|usage}"
+	RETVAL=2
 esac
 
 exit $RETVAL


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/F-13/openldap.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- openldap.spec	19 Mar 2010 09:34:48 -0000	1.161
+++ openldap.spec	30 Jun 2010 17:22:39 -0000	1.162
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 6%{?dist}
+Release: 8%{?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}/$
 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,6 +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
+	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_upgrade -- "ldap"  -h /var/lib/ldap /var/lib/ldap/*.bdb
     /sbin/runuser -m -s /usr/sbin/slapd_db_checkpoint -- "ldap" -h /var/lib/ldap -1
     rm -f /var/lib/ldap/need_db_upgrade
@@ -631,6 +634,13 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Wed Jun 30 2010 Jan Zeleny <jzeleny at redhat.com> - 2.4.21-8
+- fixed issue with owner of /usr/lib/ldap/__db.* (#609523)
+
+* Thu May 27 2010 Jan Zeleny <jzeleny at redhat.com> - 2.4.21-7
+- updated autofs schema (#587722)
+- openldap built with conectionless support (#587722)
+
 * Fri Mar 19 2010 Jan Zeleny <jzeleny at redhat.com> - 2.4.21-6
 - moved slapd to start earlier during boot sequence