X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foc.c;h=623c5399e8c39dd06fa6d8dbc8efc5daadaf9e2e;hb=410d51446154d4bcac1bd1c83b83892f4a75b9e7;hp=aff2f7e8c4fdc6a8b65d691c4395667c17dd6caa;hpb=8502301b006e170acbc4ae9ee7aa6871f9fc79f4;p=openldap

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index aff2f7e8c4..623c5399e8 100644
--- 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-2003 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"
@@ -119,7 +128,7 @@ int is_entry_objectclass(
 
 
 struct oindexrec {
-	struct berval	oir_name;
+	struct berval oir_name;
 	ObjectClass	*oir_oc;
 };
 
@@ -355,6 +364,7 @@ oc_insert(
 	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 ) {
@@ -479,33 +489,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;
 }