Remove extensible filter #ifdef

[openldap] / servers / slapd / schema_prep.c

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 33192a6661f3704d2652d5d8ea82411c6ef370f7..9b120884783cdb819391406e91a466e2a288aa52 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -15,6 +15,7 @@
 
 #include "slap.h"
 #include "ldap_pvt.h"
+#include "ldap_pvt_uc.h"
 
 int schema_init_done = 0;
 
@@ -26,7 +27,7 @@ struct slap_internal_schema slap_schema;
 static int
 objectClassMatch(
        int *matchp,
-       unsigned use,
+       slap_mask_t flags,
        Syntax *syntax,
        MatchingRule *mr,
        struct berval *value,
@@ -37,7 +38,7 @@ objectClassMatch(
        ObjectClass *asserted = oc_find( a->bv_val );
 
        if( asserted == NULL ) {
-               if( OID_LEADCHAR( *value->bv_val ) ) {
+               if( OID_LEADCHAR( *a->bv_val ) ) {
                        /* OID form, return FALSE */
                        *matchp = 1;
                        return LDAP_SUCCESS;
@@ -52,15 +53,72 @@ objectClassMatch(
                return SLAPD_COMPARE_UNDEFINED;
        }
 
+       if( flags & SLAP_MR_MODIFY_MATCHING ) {
+               *matchp = ( asserted != oc );
+       } else {
+               *matchp = !is_object_subclass( asserted, oc );
+       }
+
 #if 0
-       Debug( LDAP_DEBUG_TRACE, "objectClassMatch(%s,%s)\n",
-               value->bv_val, a->bv_val, NULL );
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "schema", LDAP_LEVEL_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 );
+#endif
+
 #endif
 
-       *matchp = !is_object_subclass( asserted, oc );
+       return LDAP_SUCCESS;
+}
 
-       Debug( LDAP_DEBUG_TRACE, "\treturns %d\n",
-               *matchp, NULL, NULL );
+#define structuralObjectClassIndexer NULL
+#define structuralObjectClassFilter NULL
+
+static int
+structuralObjectClassMatch(
+       int *matchp,
+       slap_mask_t flags,
+       Syntax *syntax,
+       MatchingRule *mr,
+       struct berval *value,
+       void *assertedValue )
+{
+       struct berval *a = (struct berval *) assertedValue;
+       ObjectClass *oc = oc_find( value->bv_val );
+       ObjectClass *asserted = oc_find( a->bv_val );
+
+       if( asserted == NULL ) {
+               if( OID_LEADCHAR( *a->bv_val ) ) {
+                       /* OID form, return FALSE */
+                       *matchp = 1;
+                       return LDAP_SUCCESS;
+               }
+
+               /* desc form, return undefined */
+               return SLAPD_COMPARE_UNDEFINED;
+       }
+
+       if ( oc == NULL ) {
+               /* unrecognized stored value */
+               return SLAPD_COMPARE_UNDEFINED;
+       }
+
+       *matchp = ( asserted != oc );
+
+#if 0
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "schema", LDAP_LEVEL_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 );
+#endif
+
+#endif
 
        return LDAP_SUCCESS;
 }
@@ -89,6 +147,10 @@ struct slap_schema_ad_map {
        { "objectClass",
                objectClassMatch, objectClassIndexer, objectClassFilter,
                offsetof(struct slap_internal_schema, si_ad_objectClass) },
+       { "structuralObjectClass",
+               structuralObjectClassMatch,
+               structuralObjectClassIndexer, structuralObjectClassFilter,
+               offsetof(struct slap_internal_schema, si_ad_structuralObjectClass) },
 
        /* user entry operational attributes */
        { "creatorsName", NULL, NULL, NULL,
@@ -152,6 +214,17 @@ struct slap_schema_ad_map {
        { NULL, NULL, NULL, NULL, 0 }
 };
 
+static AttributeType slap_at_undefined = {
+       "UNDEFINED", /* cname */
+       { "1.1.1", NULL, NULL, 1, NULL,
+               NULL, NULL, NULL, NULL,
+               0, 0, 0, 1, 3 },
+       NULL, /* sup */
+       NULL, /* subtypes */
+       NULL, NULL, NULL, NULL, /* matching rules */
+       NULL, /* syntax (this may need to be defined) */
+       NULL  /* next */
+};
 
 int
 schema_prep( void )
@@ -198,6 +271,14 @@ schema_prep( void )
                }
        }
 
+       slap_at_undefined.sat_syntax = syn_find( SLAPD_OCTETSTRING_SYNTAX );
+       if( slap_at_undefined.sat_syntax == NULL ) {
+               fprintf( stderr,
+                       "No octetString syntax \"" SLAPD_OCTETSTRING_SYNTAX "\"\n" );
+               return LDAP_INVALID_SYNTAX;
+       }
+       slap_schema.si_at_undefined = &slap_at_undefined;
+
        ++schema_init_done;
        return LDAP_SUCCESS;
 }