Commit 7ab954d5 authored by Pierangelo Masarati's avatar Pierangelo Masarati
Browse files

blind fix (accrding to back-monitor hack)

parent dd3157bb
......@@ -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;
}
......
......@@ -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(): "
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment