]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/schema_prep.c
projects / openldap / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Mem context tweaks for bdb_dn2idl
[openldap] / servers / slapd / schema_prep.c
diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 5905bb61c84aead02a687efdd8b859a521aeb27f..48d00a9df324972e79b1c75502b030ef1ccbca45 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -28,14 +28,15 @@ static int objectClassNormalize(
        struct slap_syntax *syntax, /* NULL if in is asserted value */
        struct slap_matching_rule *mr,
        struct berval * in,
-       struct berval * out )
+       struct berval * out,
+       void *ctx )
 {
        ObjectClass *oc = oc_bvfind( in );
 
        if( oc != NULL ) {
-               ber_dupbv( out, &oc->soc_cname );
+               ber_dupbv_x( out, &oc->soc_cname, ctx );
        } else {
-               ber_dupbv( out, in );
+               ber_dupbv_x( out, in, ctx );
        }
 
 #if OCDEBUG
@@ -90,15 +91,12 @@ objectSubClassMatch(
                return SLAPD_COMPARE_UNDEFINED;
        }
 
-#ifdef SLAP_NVALUES
-       assert(0 /* FIX ME */);
-#else
-       if( SLAP_IS_MR_ATTRIBUTE_SYNTAX_MATCH( flags ) ) {
+       if( SLAP_MR_IS_VALUE_OF_ATTRIBUTE_SYNTAX( flags ) )
+       {
                *matchp = ( asserted != oc );
        } else {
                *matchp = !is_object_subclass( asserted, oc );
        }
-#endif
 
 #if OCDEBUG
 #ifdef NEW_LOGGING
@@ -121,7 +119,8 @@ static int objectSubClassIndexer(
        struct slap_matching_rule *mr,
        struct berval *prefix,
        BerVarray values,
-       BerVarray *keysp )
+       BerVarray *keysp,
+       void *ctx )
 {
        int rc, noc, i;
        BerVarray ocvalues;
@@ -131,7 +130,7 @@ static int objectSubClassIndexer(
        }
 
        /* over allocate */
-       ocvalues = ch_malloc( sizeof( struct berval ) * (noc+16) );
+       ocvalues = sl_malloc( sizeof( struct berval ) * (noc+16), ctx );
 
        /* copy listed values (and termination) */
        for( i=0; i<noc; i++ ) {
@@ -188,8 +187,8 @@ static int objectSubClassIndexer(
                        }
 
                        if( !found ) {
-                               ocvalues = ch_realloc( ocvalues,
-                                       sizeof( struct berval ) * (noc+2) );
+                               ocvalues = sl_realloc( ocvalues,
+                                       sizeof( struct berval ) * (noc+2), ctx );
 
                                assert( k == noc );
 
@@ -229,9 +228,9 @@ static int objectSubClassIndexer(
 #endif
 
        rc = octetStringIndexer( use, mask, syntax, mr,
-               prefix, ocvalues, keysp );
+               prefix, ocvalues, keysp, ctx );
 
-       ch_free( ocvalues );
+       sl_free( ocvalues, ctx );
        return rc;
 }
 
@@ -243,7 +242,8 @@ static int objectSubClassFilter(
        MatchingRule *mr,
        struct berval *prefix,
        void * assertedValue,
-       BerVarray *keysp )
+       BerVarray *keysp,
+       void *ctx )
 {
 #if OCDEBUG
        struct berval *bv = (struct berval *) assertedValue;
@@ -262,7 +262,7 @@ static int objectSubClassFilter(
 #endif
 
        return octetStringFilter( use, flags, syntax, mr,
-               prefix, assertedValue, keysp );
+               prefix, assertedValue, keysp, ctx );
 }
 
 static ObjectClassSchemaCheckFN rootDseObjectClass;
@@ -318,12 +318,6 @@ static struct slap_schema_oc_map {
                        "matchingRuleUse ) )",
                subentryObjectClass, SLAP_OC_OPERATIONAL,
                offsetof(struct slap_internal_schema, si_oc_subschema) },
-       { "monitor", "( 1.3.6.1.4.1.4203.666.3.2 NAME 'monitor' "
-               "DESC 'OpenLDAP system monitoring' "
-               "STRUCTURAL "
-               "MUST cn )",
-               0, SLAP_OC_OPERATIONAL,
-               offsetof(struct slap_internal_schema, si_oc_monitor) },
 #ifdef LDAP_DEVEL
        { "collectiveAttributeSubentry", "( 2.5.17.2 "
                        "NAME 'collectiveAttributeSubentry' "
@@ -338,6 +332,30 @@ static struct slap_schema_oc_map {
                dynamicObjectClass, SLAP_OC_DYNAMICOBJECT,
                offsetof(struct slap_internal_schema, si_oc_dynamicObject) },
 #endif
+#ifdef LDAP_SYNCREPL
+               { "glue", "( 1.3.6.1.4.1.4203.666.3.4 "
+                               "NAME 'glue' "
+                               "DESC 'Glue Entry' "
+                               "SUP top STRUCTURAL )",
+                       0, SLAP_OC_OPERATIONAL,
+                       offsetof(struct slap_internal_schema, si_oc_glue) },
+
+               { "syncConsumerSubentry", "( 1.3.6.1.4.1.4203.666.3.5 "
+                               "NAME 'syncConsumerSubentry' "
+                               "DESC 'Persistent Info for SyncRepl Consumer' "
+                               "AUXILIARY "
+                               "MAY syncreplCookie )",
+                       0, SLAP_OC_OPERATIONAL,
+                       offsetof(struct slap_internal_schema, si_oc_syncConsumerSubentry) },
+               { "syncProviderSubentry", "( 1.3.6.1.4.1.4203.666.3.6 "
+                               "NAME 'syncProviderSubentry' "
+                               "DESC 'Persistent Info for SyncRepl Producer' "
+                               "AUXILIARY "
+                               "MAY syncreplCookie )",
+                       0, SLAP_OC_OPERATIONAL,
+                       offsetof(struct slap_internal_schema, si_oc_syncProviderSubentry) },
+#endif
+
        { NULL, NULL, NULL, 0, 0 }
 };
 
@@ -456,7 +474,7 @@ static struct slap_schema_ad_map {
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_entryUUID) },
        { "entryCSN", "( 1.3.6.1.4.1.4203.666.1.7 NAME 'entryCSN' "
-                       "DESC 'LCUP/LDUP: change sequence number of the entry' "
+                       "DESC 'LCUP/LDUP: change sequence number of the entry content' "
                        "EQUALITY octetStringMatch "
                        "ORDERING octetStringOrderingMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
@@ -464,6 +482,15 @@ static struct slap_schema_ad_map {
                NULL, SLAP_AT_HIDE,
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_entryCSN) },
+       { "namingCSN", "( 1.3.6.1.4.1.4203.666.1.13 NAME 'namingCSN' "
+                       "DESC 'LCUP/LDUP: change sequence number of the entry naming (RDN)' "
+                       "EQUALITY octetStringMatch "
+                       "ORDERING octetStringOrderingMatch "
+                       "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
+                       "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
+               NULL, SLAP_AT_HIDE,
+               NULL, NULL, NULL, NULL, NULL,
+               offsetof(struct slap_internal_schema, si_ad_namingCSN) },
 
        { "superiorUUID", "( 1.3.6.1.4.1.4203.666.1.11 NAME 'superiorUUID' "   
                        "DESC 'LCUP/LDUP: UUID of the superior entry' "
@@ -474,6 +501,31 @@ static struct slap_schema_ad_map {
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_superiorUUID) },
 
+#ifdef LDAP_CACHING 
+       /* LDAP cache specific operational attribute */
+       { "queryid", "( 1.3.6.1.4.1.4203.666.1.12 NAME 'queryid' "
+                       "DESC 'list of queries the entry belongs to' "
+                       "EQUALITY octetStringMatch "
+                       "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
+                       "NO-USER-MODIFICATION USAGE directoryOperation )",
+               NULL, 0, /* SLAP_AT_HIDE or SLAP_AT_NONE ? */
+               NULL, NULL, NULL, NULL, NULL, 
+               offsetof(struct slap_internal_schema, si_ad_queryid) },
+#endif /* LDAP_CACHING */
+
+#ifdef LDAP_SYNCREPL
+       { "syncreplCookie", "( 1.3.6.1.4.1.4203.666.1.23 "
+                       "NAME 'syncreplCookie' "
+                       "DESC 'syncrepl Cookie for shadow copy' "
+                       "EQUALITY octetStringMatch "
+                       "ORDERING octetStringOrderingMatch "
+                       "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
+                       "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
+               NULL, SLAP_AT_HIDE,
+               NULL, NULL, NULL, NULL, NULL,
+               offsetof(struct slap_internal_schema, si_ad_syncreplCookie) },
+#endif
+
        /* root DSE attributes */
        { "altServer", "( 1.3.6.1.4.1.1466.101.120.6 NAME 'altServer' "
                        "DESC 'RFC2252: alternative servers' "
@@ -772,7 +824,6 @@ static struct slap_schema_ad_map {
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_krbName) },
 #endif
-
        { NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0 }
 };
 
@@ -806,9 +857,8 @@ static struct slap_schema_mr_map {
                offsetof(struct slap_internal_schema, si_mr_distinguishedNameMatch) },
        { "integerMatch",
                offsetof(struct slap_internal_schema, si_mr_integerMatch) },
-       { "integerFirstComponentMatch",
-               offsetof(struct slap_internal_schema,
-                       si_mr_integerFirstComponentMatch) },
+       { "integerFirstComponentMatch", offsetof(struct slap_internal_schema,
+               si_mr_integerFirstComponentMatch) },
        { NULL, 0 }
 };
 
Cloned from git://git.openldap.org/openldap.git