--- servers/slapd/root_dse.c 2005/04/21 21:36:37 1.102 +++ servers/slapd/root_dse.c 2005/04/22 12:34:10 1.103 @@ -1,5 +1,5 @@ /* root_dse.c - Provides the Root DSA-Specific Entry */ -/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.101 2005/03/24 04:13:31 hyc Exp $ */ +/* $OpenLDAP: pkg/ldap/servers/slapd/root_dse.c,v 1.102 2005/04/21 21:36:37 ando Exp $ */ /* This work is part of OpenLDAP Software . * * Copyright 1999-2005 The OpenLDAP Foundation. @@ -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; } }