Fix cursor initialization, scope IDs

[openldap] / servers / slapd / oc.c

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 9b901ca475e74744f7f329f2fd4fcd50bcc4b6b5..30c542a58241a6a563ad6ee301b65c85a1886321 100644 (file)
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -119,7 +119,7 @@ int is_entry_objectclass(
 
 
 struct oindexrec {
-       struct berval   oir_name;
+       struct berval oir_name;
        ObjectClass     *oir_oc;
 };
 
@@ -480,33 +480,30 @@ 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;
                }
 
 #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 ) )
+              (long) val.bv_len, val.bv_val, 0 );
 #endif
+               nval.bv_val = oc->soc_oid;
+               nval.bv_len = strlen(oc->soc_oid);
+
+               if( attr_merge_one( e, ad_objectClasses, &val, &nval ) )
                {
                        return -1;
                }
-               ldap_memfree( vals[0].bv_val );
+               ldap_memfree( val.bv_val );
        }
        return 0;
 }