ITS#3151 always reschedule consistency_check task

[openldap] / servers / slapd / oc.c

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index aff2f7e8c4fdc6a8b65d691c4395667c17dd6caa..78ebaa7c6083cd2dc0f1ee17044e8fd446542813 100644 (file)
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -1,8 +1,17 @@
 /* oc.c - object class routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -24,7 +33,7 @@ int is_object_subclass(
 
        if( sub == NULL || sup == NULL ) return 0;
 
-#if 1
+#if 0
 #ifdef NEW_LOGGING
        LDAP_LOG ( OPERATION, ARGS, 
                "is_object_subclass(%s,%s) %d\n",
@@ -119,7 +128,7 @@ int is_entry_objectclass(
 
 
 struct oindexrec {
-       struct berval   oir_name;
+       struct berval oir_name;
        ObjectClass     *oir_oc;
 };
 
@@ -134,8 +143,7 @@ oc_index_cmp(
 {
        const struct oindexrec *oir1 = v_oir1, *oir2 = v_oir2;
        int i = oir1->oir_name.bv_len - oir2->oir_name.bv_len;
-       if (i)
-               return i;
+       if (i) return i;
        return strcasecmp( oir1->oir_name.bv_val, oir2->oir_name.bv_val );
 }
 
@@ -147,8 +155,7 @@ oc_index_name_cmp(
        const struct berval    *name = v_name;
        const struct oindexrec *oir  = v_oir;
        int i = name->bv_len - oir->oir_name.bv_len;
-       if (i)
-               return i;
+       if (i) return i;
        return strncasecmp( name->bv_val, oir->oir_name.bv_val, name->bv_len );
 }
 
@@ -349,12 +356,12 @@ oc_destroy( void )
 static int
 oc_insert(
     ObjectClass                *soc,
-    const char         **err
-)
+    const char         **err )
 {
        struct oindexrec        *oir;
        char                    **names;
 
+       LDAP_SLIST_NEXT( soc, soc_next ) = NULL;
        LDAP_SLIST_INSERT_HEAD( &oc_list, soc, soc_next );
 
        if ( soc->soc_oid ) {
@@ -368,7 +375,7 @@ oc_insert(
                assert( oir->oir_oc );
 
                if ( avl_insert( &oc_index, (caddr_t) oir,
-                                oc_index_cmp, avl_dup_error ) )
+                       oc_index_cmp, avl_dup_error ) )
                {
                        *err = soc->soc_oid;
                        ldap_memfree(oir);
@@ -391,7 +398,7 @@ oc_insert(
                        assert( oir->oir_oc );
 
                        if ( avl_insert( &oc_index, (caddr_t) oir,
-                                        oc_index_cmp, avl_dup_error ) )
+                               oc_index_cmp, avl_dup_error ) )
                        {
                                *err = *names;
                                ldap_memfree(oir);
@@ -412,8 +419,7 @@ int
 oc_add(
     LDAPObjectClass    *oc,
        int user,
-    const char         **err
-)
+    const char         **err )
 {
        ObjectClass     *soc;
        int             code;
@@ -479,33 +485,29 @@ oc_add(
 int
 oc_schema_info( Entry *e )
 {
-       struct berval   vals[2];
-       ObjectClass     *oc;
-
        AttributeDescription *ad_objectClasses = slap_schema.si_ad_objectClasses;
-
-       vals[1].bv_val = NULL;
+       ObjectClass     *oc;
+       struct berval   val;
+       struct berval   nval;
 
        LDAP_SLIST_FOREACH( oc, &oc_list, soc_next ) {
                if( oc->soc_flags & SLAP_OC_HIDE ) continue;
 
-               if ( ldap_objectclass2bv( &oc->soc_oclass, vals ) == NULL ) {
+               if ( ldap_objectclass2bv( &oc->soc_oclass, &val ) == NULL ) {
                        return -1;
                }
 
+               nval = oc->soc_cname;
+
 #if 0
-               Debug( LDAP_DEBUG_TRACE, "Merging oc [%ld] %s\n",
-              (long) vals[0].bv_len, vals[0].bv_val, 0 );
-#endif
-#ifdef SLAP_NVALUES
-               if( attr_merge( e, ad_objectClasses, vals, NULL /* FIXME */ ) )
-#else
-               if( attr_merge( e, ad_objectClasses, vals ) )
+               Debug( LDAP_DEBUG_TRACE, "Merging oc [%ld] %s (%s)\n",
+              (long) val.bv_len, val.bv_val, nval.bv_val );
 #endif
-               {
+
+               if( attr_merge_one( e, ad_objectClasses, &val, &nval ) ) {
                        return -1;
                }
-               ldap_memfree( vals[0].bv_val );
+               ldap_memfree( val.bv_val );
        }
        return 0;
 }