X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foc.c;h=30c542a58241a6a563ad6ee301b65c85a1886321;hb=ca9bb44089145bdb7435135714590d48f4a6eabd;hp=9159a8ed705a6b4b614dbeacb7f1317f9364e286;hpb=7735c44167acf9a149ce5eaf2cfc34a76db5ea4a;p=openldap

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 9159a8ed70..30c542a582 100644
--- 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;
 };
 
@@ -483,9 +483,7 @@ oc_schema_info( Entry *e )
 	AttributeDescription *ad_objectClasses = slap_schema.si_ad_objectClasses;
 	ObjectClass	*oc;
 	struct berval	val;
-#ifdef SLAP_NVALUES
 	struct berval	nval;
-#endif
 
 	LDAP_SLIST_FOREACH( oc, &oc_list, soc_next ) {
 		if( oc->soc_flags & SLAP_OC_HIDE ) continue;
@@ -498,14 +496,10 @@ oc_schema_info( Entry *e )
 		Debug( LDAP_DEBUG_TRACE, "Merging oc [%ld] %s\n",
 	       (long) val.bv_len, val.bv_val, 0 );
 #endif
-#ifdef SLAP_NVALUES
 		nval.bv_val = oc->soc_oid;
 		nval.bv_len = strlen(oc->soc_oid);
 
 		if( attr_merge_one( e, ad_objectClasses, &val, &nval ) )
-#else
-		if( attr_merge_one( e, ad_objectClasses, &val ) )
-#endif
 		{
 			return -1;
 		}