X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschema_prep.c;h=5813aa52c09e56f855cc48cdae4e3da09eae74e8;hb=804490a8b12a94a19e7c1a8710a7d8a2fb7d5477;hp=6ef84a90e9a655557e4689fc44c1dc70b33749d8;hpb=55e925abe63b49cdf6a5ddcd88240b2259eb7dc1;p=openldap

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 6ef84a90e9..5813aa52c0 100644
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -364,6 +364,15 @@ static struct slap_schema_ad_map {
 			"USAGE dSAOperation )",
 		rootDseAttribute, 0, NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_supportedFeatures) },
+	{ "monitorContext", "( 1.3.6.1.4.1.4203.666.1.10 "
+			"NAME 'monitorContext' "
+			"DESC 'monitor context' "
+			"EQUALITY objectIdentifierMatch "
+			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 "
+			"SINGLE-VALUE NO-USER-MODIFICATION "
+			"USAGE dSAOperation )",
+		rootDseAttribute, SLAP_AT_HIDE, NULL, NULL, NULL,
+		offsetof(struct slap_internal_schema, si_ad_monitorContext) },
 	{ "vendorName", "( 1.3.6.1.1.4 NAME 'vendorName' "
 			"DESC 'RFC3045: name of implementation vendor' "
 			"EQUALITY 1.3.6.1.4.1.1466.109.114.1 "
@@ -478,6 +487,22 @@ static struct slap_schema_ad_map {
 			"SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation )",
 		NULL, SLAP_AT_HIDE, NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_children) },
+	{ "saslAuthzTo", "( 1.3.6.1.4.1.4203.666.1.8 "
+			"NAME 'saslAuthzTo' "
+			"DESC 'SASL proxy authorization targets' "
+			"EQUALITY caseExactMatch "
+			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 "
+			"USAGE distributedOperation )",
+		NULL, SLAP_AT_HIDE, NULL, NULL, NULL,
+		offsetof(struct slap_internal_schema, si_ad_saslAuthzTo) },
+	{ "saslAuthzFrom", "( 1.3.6.1.4.1.4203.666.1.9 "
+			"NAME 'saslAuthzFrom' "
+			"DESC 'SASL proxy authorization sources' "
+			"EQUALITY caseExactMatch "
+			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 "
+			"USAGE distributedOperation )",
+		NULL, SLAP_AT_HIDE, NULL, NULL, NULL,
+		offsetof(struct slap_internal_schema, si_ad_saslAuthzFrom) },
 #ifdef SLAPD_ACI_ENABLED
 	{ "OpenLDAPaci", "( 1.3.6.1.4.1.4203.666.1.5 "
 			"NAME 'OpenLDAPaci' "
@@ -526,7 +551,7 @@ static struct slap_schema_ad_map {
 			"DESC 'RFC2256/2307: password of user' "
 			"EQUALITY octetStringMatch "
 			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{128} )",
-		NULL, SLAP_AT_FINAL, NULL, NULL, NULL,
+		NULL, 0, NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_userPassword) },
 
 #ifdef SLAPD_AUTHPASSWD
@@ -535,7 +560,7 @@ static struct slap_schema_ad_map {
 			"DESC 'RFC3112: authentication password attribute' "
 			"EQUALITY 1.3.6.1.4.1.4203.1.2.2 "
 			"SYNTAX 1.3.6.1.4.1.4203.1.1.2 )",
-		NULL, SLAP_AT_FINAL,
+		NULL, 0,
 		NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_authPassword) },
 	{ "supportedAuthPasswordSchemes", "( 1.3.6.1.4.1.4203.1.3.3 "
@@ -548,8 +573,13 @@ static struct slap_schema_ad_map {
 		offsetof(struct slap_internal_schema, si_ad_authPassword) },
 #endif
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
-	{ "krbName", NULL,
-		NULL, SLAP_AT_FINAL, NULL, NULL, NULL,
+	{ "krbName", "( 1.3.6.1.4.1.250.1.32 "
+			"NAME ( 'krbName' 'kerberosName' ) "
+			"DESC 'Kerberos principal associated with object' "
+			"EQUALITY caseIgnoreIA5Match "
+			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 "
+			"SINGLE-VALUE )",
+		NULL, 0, NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_krbName) },
 #endif