From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 26 Feb 2003 19:41:27 +0000 (+0000)
Subject: blind fix (accrding to back-monitor hack)
X-Git-Tag: NO_SLAP_OP_BLOCKS~274
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7ab954d516fcb48c683f13ec04fe10eec6696df9;p=openldap

blind fix (accrding to back-monitor hack)
---

diff --git a/servers/slapd/back-sql/entry-id.c b/servers/slapd/back-sql/entry-id.c
index 209821d755..eea0e15f55 100644
--- a/servers/slapd/back-sql/entry-id.c
+++ b/servers/slapd/back-sql/entry-id.c
@@ -409,7 +409,7 @@ backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid )
 				bsi, 0, AVL_INORDER );
 	}
 
-	if ( attr_merge_one( bsi->e, ad_oc, &bsi->oc->oc->soc_cname ) ) {
+	if ( attr_mergeit_one( bsi->e, ad_oc, &bsi->oc->oc->soc_cname ) ) {
 		entry_free( e );
 		return NULL;
 	}
@@ -436,7 +436,7 @@ backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid )
 
 		if ( bsi->bsi_flags | BSQL_SF_ALL_OPER 
 				|| an_find( bsi->attrs, &AllOper ) ) {
-			if ( attr_merge_one( bsi->e, ad_soc, &soc ) ) {
+			if ( attr_mergeit_one( bsi->e, ad_soc, &soc ) ) {
 				entry_free( e );
 				return NULL;
 			}
diff --git a/servers/slapd/back-sql/util.c b/servers/slapd/back-sql/util.c
index 1b7e3379ff..488a15a419 100644
--- a/servers/slapd/back-sql/util.c
+++ b/servers/slapd/back-sql/util.c
@@ -255,7 +255,7 @@ backsql_entry_addattr(
 		return 0;
 	}
 
-	rc = attr_merge_one( e, ad, at_val );
+	rc = attr_mergeit_one( e, ad, at_val );
 
 	if ( rc != 0 ) {
 		Debug( LDAP_DEBUG_TRACE, "backsql_entry_addattr(): "