Imported Debian patch 8.13.3-6debian/8.13.3-6

1 files changed, 67 insertions, 14 deletions

diff --git a/debian/examples/ldap/sendmail.schema.v2 b/debian/examples/ldap/sendmail.schema.v2
index bab47e8..a532f8b 100644
--- a/debian/examples/ldap/sendmail.schema.v2
+++ b/debian/examples/ldap/sendmail.schema.v2
@@ -1,11 +1,11 @@
-# Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
 # forth in the LICENSE file which can be found at the top level of
 # the sendmail distribution.
 #
-# $Id: sendmail.schema,v 8.14 2001/08/31 17:18:18 gshapiro Exp $
+# $Id: sendmail.schema,v 8.21 2002/11/20 23:13:50 gshapiro Exp $
 
 # Note that this schema is experimental at this point as it has had little
 # public review.  Therefore, it may change in future versions.  Feedback
@@ -87,6 +87,20 @@ attributetype ( 1.3.6.1.4.1.6152.10.3.1.16
 	EQUALITY caseIgnoreMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
 
+# attribute sendmailMTAMapSearch cis
+attributetype ( 1.3.6.1.4.1.6152.10.3.1.24
+	NAME 'sendmailMTAMapSearch'
+	DESC 'recursive search for values of a map entry'
+	EQUALITY caseExactMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+
+# attribute sendmailMTAMapURL cis
+attributetype ( 1.3.6.1.4.1.6152.10.3.1.25
+	NAME 'sendmailMTAMapURL'
+	DESC 'recursive search URL for values of a map entry'
+	EQUALITY caseExactMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+
 #objectClass sendmailMTAMap
 #	requires
 #		objectClass,
@@ -108,18 +122,22 @@ objectclass ( 1.3.6.1.4.1.6152.10.3.2.11
 #		objectClass,
 #		sendmailMTAMapName,
 #		sendmailMTAKey,
-#		sendmailMTAMapValue,
 #	allows
 #		sendmailMTACluster,
 #		sendmailMTAHost,
+#		sendmailMTAMapValue,
+#		sendmailMTAMapSearch,
+#		sendmailMTAMapURL,
 #		Description
 
 objectclass ( 1.3.6.1.4.1.6152.10.3.2.12
 	NAME 'sendmailMTAMapObject'
 	SUP sendmailMTAMap STRUCTURAL
 	DESC 'Sendmail MTA map object'
-	MUST ( sendmailMTAMapName $ sendmailMTAKey $ sendmailMTAMapValue )
-	MAY ( sendmailMTACluster $ sendmailMTAHost $ Description ) )
+	MUST ( sendmailMTAMapName $ sendmailMTAKey )
+	MAY ( sendmailMTACluster $ sendmailMTAHost $ 
+		sendmailMTAMapValue $ sendmailMTAMapSearch $
+		sendmailMTAMapURL $ Description ) )
 
 
 ###########################################################################
@@ -132,8 +150,8 @@ objectclass ( 1.3.6.1.4.1.6152.10.3.2.12
 attributetype ( 1.3.6.1.4.1.6152.10.3.1.18
 	NAME 'sendmailMTAAliasGrouping'
 	DESC 'name that identifies a particular aliases grouping'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # attribute sendmailMTAAliasValue	cis
@@ -143,6 +161,20 @@ attributetype ( 1.3.6.1.4.1.6152.10.3.1.20
 	EQUALITY caseIgnoreMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
+# attribute sendmailMTAAliasSearch cis
+attributetype ( 1.3.6.1.4.1.6152.10.3.1.26
+	NAME 'sendmailMTAAliasSearch'
+	DESC 'recursive search for values of an alias'
+	EQUALITY caseExactMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+
+# attribute sendmailMTAAliasURL cis
+attributetype ( 1.3.6.1.4.1.6152.10.3.1.27
+	NAME 'sendmailMTAAliasURL'
+	DESC 'recursive search URL for values of an alias'
+	EQUALITY caseExactMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+
 #objectClass sendmailMTAAlias
 #	requires
 #		objectClass,
@@ -163,20 +195,23 @@ objectclass ( 1.3.6.1.4.1.6152.10.3.2.13
 #	requires
 #		objectClass,
 #		sendmailMTAKey,
-#		sendmailMTAAliasValue,
 #	allows
 #		sendmailMTAAliasGrouping,
 #		sendmailMTACluster,
 #		sendmailMTAHost,
+#		sendmailMTAAliasValue,
+#		sendmailMTAAliasSearch,
+#		sendmailMTAAliasURL,
 #		Description
 
 objectclass ( 1.3.6.1.4.1.6152.10.3.2.14
 	NAME 'sendmailMTAAliasObject'
 	SUP sendmailMTAAlias STRUCTURAL
 	DESC 'Sendmail MTA alias object'
-	MUST ( sendmailMTAKey $ sendmailMTAAliasValue )
-	MAY ( sendmailMTAAliasGrouping $
-		sendmailMTACluster $ sendmailMTAHost $ Description ) )
+	MUST sendmailMTAKey
+	MAY ( sendmailMTAAliasGrouping $ sendmailMTACluster $
+		sendmailMTAHost $ sendmailMTAAliasValue $
+		sendmailMTAAliasSearch $ sendmailMTAAliasURL $ Description ) )
 
 ###########################################################################
 #
@@ -198,19 +233,37 @@ attributetype ( 1.3.6.1.4.1.6152.10.3.1.23
 	EQUALITY caseIgnoreMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
+# attribute sendmailMTAClassSearch cis
+attributetype ( 1.3.6.1.4.1.6152.10.3.1.28
+	NAME 'sendmailMTAClassSearch'
+	DESC 'recursive search for members of a class'
+	EQUALITY caseExactMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+
+# attribute sendmailMTAClassURL cis
+attributetype ( 1.3.6.1.4.1.6152.10.3.1.29
+	NAME 'sendmailMTAClassURL'
+	DESC 'recursive search URL for members of a class'
+	EQUALITY caseExactMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+
 #objectClass sendmailMTAClass
 #	requires
 #		objectClass,
 #		sendmailMTAClassName,
-#		sendmailMTAClassValue,
 #	allows
 #		sendmailMTACluster,
 #		sendmailMTAHost,
+#		sendmailMTAClassValue,
+#		sendmailMTAClassSearch,
+#		sendmailMTAClassURL,
 #		Description
 
 objectclass ( 1.3.6.1.4.1.6152.10.3.2.15
 	NAME 'sendmailMTAClass'
 	SUP sendmailMTA STRUCTURAL
 	DESC 'Sendmail MTA class definition'
-	MUST ( sendmailMTAClassName $ sendmailMTAClassValue )
-	MAY ( sendmailMTACluster $ sendmailMTAHost $ Description ) )
+	MUST sendmailMTAClassName
+	MAY ( sendmailMTACluster $ sendmailMTAHost $
+		sendmailMTAClassValue $ sendmailMTAClassSearch $
+		sendmailMTAClassURL $ Description ) )