vrFilter fixes

[openldap] / servers / slapd / schema_prep.c

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 184aad8d155b8dd4d3fa1ce4ce8ee396839dac86..15bf1e3c8f5d894b9623ec51e454d28ce129f2f8 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -36,9 +36,8 @@ objectClassMatch(
 
 #if 1
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
-                  "> objectClassMatch(%s, %s)\n",
-                  value->bv_val, a->bv_val ));
+       LDAP_LOG( CONFIG, ENTRY, 
+               "> objectClassMatch(%s, %s)\n", value->bv_val, a->bv_val, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "> objectClassMatch(%s,%s)\n",
                value->bv_val, a->bv_val, 0 );
@@ -69,9 +68,9 @@ objectClassMatch(
 
 #if 1
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
-                  "< objectClassMatch(%s, %s) = %d\n",
-                  value->bv_val, a->bv_val, *matchp ));
+       LDAP_LOG( CONFIG, ENTRY, 
+               "< objectClassMatch(%s, %s) = %d\n",
+               value->bv_val, a->bv_val, *matchp );
 #else
        Debug( LDAP_DEBUG_TRACE, "< objectClassMatch(%s,%s) = %d\n",
                value->bv_val, a->bv_val, *matchp );
@@ -99,9 +98,8 @@ structuralObjectClassMatch(
 
 #if 1
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
-                  "> structuralObjectClassMatch(%s, %s)\n",
-                  value->bv_val, a->bv_val ));
+       LDAP_LOG( CONFIG, ENTRY, 
+               "> structuralObjectClassMatch(%s, %s)\n", value->bv_val, a->bv_val, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "> structuralObjectClassMatch(%s,%s)\n",
                value->bv_val, a->bv_val, 0 );
@@ -128,9 +126,9 @@ structuralObjectClassMatch(
 
 #if 1
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
-                  "< structuralObjectClassMatch( %s, %s ) = %d\n",
-                  value->bv_val, a->bv_val, *matchp ));
+       LDAP_LOG( CONFIG, ENTRY, 
+               "< structuralObjectClassMatch( %s, %s ) = %d\n",
+               value->bv_val, a->bv_val, *matchp );
 #else
        Debug( LDAP_DEBUG_TRACE, "< structuralObjectClassMatch(%s,%s) = %d\n",
                value->bv_val, a->bv_val, *matchp );
@@ -339,6 +337,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 "
@@ -453,7 +460,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' "
@@ -488,7 +510,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
@@ -497,7 +519,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 "
@@ -510,8 +532,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