From: Howard Chu <hyc@openldap.org>
Date: Fri, 22 Apr 2005 14:34:10 +0000 (+0000)
Subject: Fix prev commit
X-Git-Tag: OPENLDAP_AC_BP~835
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7e27799b95e74eff126866bf8603fdf5f9ca216b;p=openldap

Fix prev commit
---

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 78c70e6d12..a4a0cf6898 100644
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -187,7 +187,7 @@ root_dse_info(
 		snprintf(buf, sizeof buf, "%d", i);
 		val.bv_val = buf;
 		val.bv_len = strlen( val.bv_val );
-		if( attr_merge( e, ad_supportedLDAPVersion, &val, NULL ) ) {
+		if( attr_merge_one( e, ad_supportedLDAPVersion, &val, NULL ) ) {
 			return LDAP_OTHER;
 		}
 	}
@@ -199,7 +199,7 @@ root_dse_info(
 		for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {
 			val.bv_val = supportedSASLMechanisms[i];
 			val.bv_len = strlen( val.bv_val );
-			if( attr_merge( e, ad_supportedSASLMechanisms, &val, NULL ) ) {
+			if( attr_merge_one( e, ad_supportedSASLMechanisms, &val, NULL ) ) {
 				return LDAP_OTHER;
 			}
 		}