mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

blind fix (accrding to back-monitor hack)

Browse Source
This commit is contained in:
Pierangelo Masarati 2003-02-26 19:41:27 +00:00
parent dd3157bbe9
commit 7ab954d516
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
servers/slapd/back-sql/entry-id.c
View File

@ -409,7 +409,7 @@ backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid )
bsi, 0, AVL_INORDER ); 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 ); entry_free( e );
return NULL; 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 if ( bsi->bsi_flags | BSQL_SF_ALL_OPER
|| an_find( bsi->attrs, &AllOper ) ) { || 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 ); entry_free( e );
return NULL; return NULL;
} }

2
servers/slapd/back-sql/util.c
View File

@ -255,7 +255,7 @@ backsql_entry_addattr(
return 0; return 0;
} }
rc = attr_merge_one( e, ad, at_val ); rc = attr_mergeit_one( e, ad, at_val );
if ( rc != 0 ) { if ( rc != 0 ) {
Debug( LDAP_DEBUG_TRACE, "backsql_entry_addattr(): " Debug( LDAP_DEBUG_TRACE, "backsql_entry_addattr(): "