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 209821d7550be8d8d3033c186749bfd1d58d8cc8..eea0e15f5541a7b2705de6bd3fd8284fce0ff69b 100644 (file)
--- 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 1b7e3379ff742b1272ed7ec9ab387e60fbe49fe9..488a15a41946da94ceae0f0c4ce0a155634448d2 100644 (file)
--- 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(): "