From 499201805be4937bafd584d27ea88be0157e0daf Mon Sep 17 00:00:00 2001
From: Jan Zeleny <jzeleny@fedoraproject.org>
Date: Jun 30 2010 17:22:39 +0000
Subject: Fixed issue with owner of /usr/lib/ldap/__db.* (#609523)

Updated autofs schema (#587722)
Openldap built with conectionless support (#587722)

---

diff --git a/autofs.schema b/autofs.schema
index d8af6f4..07e23b4 100644
--- a/autofs.schema
+++ b/autofs.schema
@@ -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
diff --git a/ldap.init b/ldap.init
index f6dc1b1..c2d99af 100644
--- a/ldap.init
+++ b/ldap.init
@@ -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