Add search no-op support.

[openldap] / servers / slapd / oc.c

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 083034d2743b60ae6919d8d46189c1883d823cb2..3a4c48d2c5940a28bfcb485a84f7a7f4f5f1aabf 100644 (file)
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -1,7 +1,7 @@
 /* oc.c - object class routines */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -48,7 +48,8 @@ int is_object_subclass(
 
 int is_entry_objectclass(
        Entry*  e,
-       ObjectClass *oc )
+       ObjectClass *oc,
+       int set_flags )
 {
        Attribute *attr;
        struct berval *bv;
@@ -59,6 +60,10 @@ int is_entry_objectclass(
                return 0;
        }
 
+       if( set_flags && ( e->e_ocflags & SLAP_OC__END )) {
+               return (e->e_ocflags & oc->soc_flags);
+       }
+
        /*
         * find objectClass attribute
         */
@@ -84,13 +89,15 @@ int is_entry_objectclass(
        for( bv=attr->a_vals; bv->bv_val; bv++ ) {
                ObjectClass *objectClass = oc_bvfind( bv );
 
-               if( objectClass == oc ) {
+               if ( objectClass == oc && !set_flags ) {
                        return 1;
                }
-       }
 
-       return 0;
+               e->e_ocflags |= objectClass->soc_flags;
+       }
+       e->e_ocflags |= SLAP_OC__END;   /* We've finished this */
 
+       return (e->e_ocflags & oc->soc_flags);
 }
 
 
@@ -389,6 +396,19 @@ oc_add(
                }
        }
 
+       if ( !OID_LEADCHAR( oc->oc_oid[0] )) {
+               /* Expand OID macros */
+               char *oid = oidm_find( oc->oc_oid );
+               if ( !oid ) {
+                       *err = oc->oc_oid;
+                       return SLAP_SCHERR_OIDM;
+               }
+               if ( oid != oc->oc_oid ) {
+                       ldap_memfree( oc->oc_oid );
+                       oc->oc_oid = oid;
+               }
+       }
+
        soc = (ObjectClass *) ch_calloc( 1, sizeof(ObjectClass) );
        AC_MEMCPY( &soc->soc_oclass, oc, sizeof(LDAPObjectClass) );