X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapadd.c;h=7aa4ee29310d9b4f277535fc4905b2a23e08cb52;hb=173330187ef1a4139e2e4c4fb30ad23832e40f77;hp=6dcaae7f5beecba85cf2ad008455e0e8bde8ceb3;hpb=7aac82d31cace2e0a9dfd440bba4f70864333531;p=openldap

diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index 6dcaae7f5b..7aa4ee2931 100644
--- a/servers/slapd/slapadd.c
+++ b/servers/slapd/slapadd.c
@@ -162,9 +162,9 @@ slapadd( int argc, char **argv )
 			}
 
 			if( sc == NULL ) {
-				struct berval vals[2];
+				struct berval val;
 
-				rc = structural_class( oc->a_vals, vals,
+				rc = structural_class( oc->a_vals, &val,
 					NULL, &text, textbuf, textlen );
 
 				if( rc != LDAP_SUCCESS ) {
@@ -176,11 +176,7 @@ slapadd( int argc, char **argv )
 					break;
 				}
 
-				vals[1].bv_len = 0;
-				vals[1].bv_val = NULL;
-
-				attr_merge( e, slap_schema.si_ad_structuralObjectClass,
-					vals, NULL /* FIXME */ );
+				attr_merge_one( e, slap_schema.si_ad_structuralObjectClass, &val, NULL );
 			}
 
 			/* check schema */
@@ -236,8 +232,7 @@ slapadd( int argc, char **argv )
 			{
 				vals[0].bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) );
 				vals[0].bv_val = uuidbuf;
-				attr_merge_normalize_one( e,
-							slap_schema.si_ad_entryUUID, vals, NULL );
+				attr_merge_normalize_one( e, slap_schema.si_ad_entryUUID, vals, NULL );
 			}
 
 			if( attr_find( e->e_attrs, slap_schema.si_ad_creatorsName )