remove all referral specific code; now referrals can be used by defining appropriate...

[openldap] / servers / slapd / oc.c

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 78ebaa7c6083cd2dc0f1ee17044e8fd446542813..b7ac0ba4e0e6b1c0b2e127e1a21be9127e2dd08a 100644 (file)
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,6 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "ldap_pvt.h"
 
 int is_object_subclass(
        ObjectClass *sup,
@@ -34,14 +33,8 @@ int is_object_subclass(
        if( sub == NULL || sup == NULL ) return 0;
 
 #if 0
-#ifdef NEW_LOGGING
-       LDAP_LOG ( OPERATION, ARGS, 
-               "is_object_subclass(%s,%s) %d\n",
-               sup->soc_oid, sub->soc_oid, sup == sub );
-#else
        Debug( LDAP_DEBUG_TRACE, "is_object_subclass(%s,%s) %d\n",
                sup->soc_oid, sub->soc_oid, sup == sub );
-#endif
 #endif
 
        if( sup == sub ) {
@@ -93,17 +86,10 @@ int is_entry_objectclass(
        attr = attr_find(e->e_attrs, objectClass);
        if( attr == NULL ) {
                /* no objectClass attribute */
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, ERR, 
-                       "is_entry_objectclass: dn(%s), oid (%s), no objectClass "
-                       "attribute.\n", e->e_dn == NULL ? "" : e->e_dn,
-                       oc->soc_oclass.oc_oid, 0 );
-#else
                Debug( LDAP_DEBUG_ANY, "is_entry_objectclass(\"%s\", \"%s\") "
                        "no objectClass attribute\n",
                        e->e_dn == NULL ? "" : e->e_dn,
                        oc->soc_oclass.oc_oid, 0 );
-#endif
 
                return 0;
        }
@@ -184,6 +170,47 @@ oc_bvfind( struct berval *ocname )
        return( NULL );
 }
 
+static LDAP_SLIST_HEAD(OCUList, slap_object_class) oc_undef_list
+       = LDAP_SLIST_HEAD_INITIALIZER(&oc_undef_list);
+
+ObjectClass *
+oc_bvfind_undef( struct berval *ocname )
+{
+       ObjectClass     *oc = oc_bvfind( ocname );
+
+       if ( oc ) {
+               return oc;
+       }
+
+       LDAP_SLIST_FOREACH( oc, &oc_undef_list, soc_next ) {
+               int     d = oc->soc_cname.bv_len - ocname->bv_len;
+
+               if ( d ) {
+                       continue;
+               }
+
+               if ( strcasecmp( oc->soc_cname.bv_val, ocname->bv_val ) == 0 ) {
+                       break;
+               }
+       }
+       
+       if ( oc ) {
+               return oc;
+       }
+       
+       oc = ch_malloc( sizeof( ObjectClass ) + ocname->bv_len + 1 );
+       memset( oc, 0, sizeof( ObjectClass ) );
+
+       oc->soc_cname.bv_len = ocname->bv_len;
+       oc->soc_cname.bv_val = (char *)&oc[ 1 ];
+       AC_MEMCPY( oc->soc_cname.bv_val, ocname->bv_val, ocname->bv_len );
+
+       LDAP_SLIST_NEXT( oc, soc_next ) = NULL;
+       LDAP_SLIST_INSERT_HEAD( &oc_undef_list, oc, soc_next );
+
+       return oc;
+}
+
 static int
 oc_create_required(
     ObjectClass                *soc,
@@ -351,6 +378,13 @@ oc_destroy( void )
                if (o->soc_allowed) ldap_memfree(o->soc_allowed);
                ldap_objectclass_free((LDAPObjectClass *)o);
        }
+       
+       while( !LDAP_SLIST_EMPTY(&oc_undef_list) ) {
+               o = LDAP_SLIST_FIRST(&oc_undef_list);
+               LDAP_SLIST_REMOVE_HEAD(&oc_undef_list, soc_next);
+
+               ch_free( (ObjectClass *)o );
+       }
 }
 
 static int
@@ -469,6 +503,7 @@ oc_add(
        }
 
        if ( code != 0 ) return code;
+       if( user && op ) return SLAP_SCHERR_CLASS_BAD_SUP;
 
        code = oc_create_required( soc, soc->soc_at_oids_must, &op, err );
        if ( code != 0 ) return code;
@@ -476,7 +511,7 @@ oc_add(
        code = oc_create_allowed( soc, soc->soc_at_oids_may, &op, err );
        if ( code != 0 ) return code;
 
-       if( user && op ) return SLAP_SCHERR_CLASS_BAD_SUP;
+       if( user && op ) return SLAP_SCHERR_CLASS_BAD_USAGE;
 
        code = oc_insert(soc,err);
        return code;