upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 08:39:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#2736 clear result strings

Browse source
This commit is contained in:
Howard Chu 2003-09-27 07:36:20 +00:00
parent 96314dce23
commit 1bb48a06fc
8 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servers/slapd/back-ldbm/add.c
View file

@ -134,7 +134,8 @@ ldbm_back_add(
ber_bvarray_free( rs->sr_ref );
free( (char *)rs->sr_matched );
rs->sr_ref = NULL;
rs->sr_matched = NULL;
return rs->sr_err;
}
@ -220,6 +221,8 @@ ldbm_back_add(
ber_bvarray_free( rs->sr_ref );
free( (char *)rs->sr_matched );
rs->sr_ref = NULL;
rs->sr_matched = NULL;
return rs->sr_err;
}
@ -408,6 +411,7 @@ ldbm_back_add(
}
rs->sr_err = LDAP_SUCCESS;
rs->sr_text = NULL;
send_ldap_result( op, rs );
/* marks the entry as committed, so it is added to the cache;

5
servers/slapd/back-ldbm/bind.c
View file

@ -81,6 +81,8 @@ ldbm_back_bind(
if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
if ( rs->sr_matched ) free( (char *)rs->sr_matched );
rs->sr_ref = NULL;
rs->sr_matched = NULL;
return rs->sr_err;
}
@ -145,7 +147,8 @@ ldbm_back_bind(
send_ldap_result( op, rs );
ber_bvarray_free( rs->sr_ref );
rs->sr_matched = NULL;
rs->sr_ref = NULL;
rc = rs->sr_err;
goto return_results;
}

6
servers/slapd/back-ldbm/compare.c
View file

@ -50,7 +50,8 @@ ldbm_back_compare(
if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
free( (char *)rs->sr_matched );
rs->sr_ref = NULL;
rs->sr_matched = NULL;
return( 1 );
}
@ -72,7 +73,8 @@ ldbm_back_compare(
send_ldap_result( op, rs );
if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
rs->sr_ref = NULL;
rs->sr_matched = NULL;
rs->sr_err = 1;
goto return_results;
}

6
servers/slapd/back-ldbm/delete.c
View file

@ -72,7 +72,8 @@ ldbm_back_delete(
if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
free( (char *)rs->sr_matched );
rs->sr_ref = NULL;
rs->sr_matched = NULL;
return( -1 );
}
@ -115,7 +116,8 @@ ldbm_back_delete(
send_ldap_result( op, rs );
if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
rs->sr_ref = NULL;
rs->sr_matched = NULL;
rc = LDAP_REFERRAL;
goto return_results;
}

7
servers/slapd/back-ldbm/modify.c
View file

@ -335,6 +335,8 @@ ldbm_back_modify(
if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
free( (char *)rs->sr_matched );
rs->sr_ref = NULL;
rs->sr_matched = NULL;
return rs->sr_err;
}
@ -357,7 +359,8 @@ ldbm_back_modify(
send_ldap_result( op, rs );
if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
rs->sr_ref = NULL;
rs->sr_matched = NULL;
goto error_return;
}
@ -381,6 +384,7 @@ ldbm_back_modify(
goto error_return;
}
rs->sr_text = NULL;
send_ldap_error( op, rs, LDAP_SUCCESS,
NULL );
@ -392,5 +396,6 @@ ldbm_back_modify(
error_return:;
cache_return_entry_w( &li->li_cache, e );
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
rs->sr_text = NULL;
return rs->sr_err;
}

7
servers/slapd/back-ldbm/modrdn.c
View file

@ -104,7 +104,8 @@ ldbm_back_modrdn(
if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
free( (char *)rs->sr_matched );
rs->sr_ref = NULL;
rs->sr_matched = NULL;
return rs->sr_err;
}
@ -146,6 +147,8 @@ ldbm_back_modrdn(
send_ldap_result( op, rs );
if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
rs->sr_ref = NULL;
rs->sr_matched = NULL;
goto return_results;
}
@ -633,6 +636,7 @@ ldbm_back_modrdn(
}
rs->sr_err = LDAP_SUCCESS;
rs->sr_text = NULL;
send_ldap_result( op, rs );
rc = 0;
cache_entry_commit( e );
@ -677,5 +681,6 @@ return_results:
entry_free( e );
}
ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
rs->sr_text = NULL;
return( rc );
}

4
servers/slapd/back-ldbm/referral.c
View file

@ -79,6 +79,8 @@ ldbm_back_referrals(
}
if ( rs->sr_matched ) free( (char *)rs->sr_matched );
rs->sr_ref = NULL;
rs->sr_matched = NULL;
return rs->sr_err;
}
@ -111,6 +113,8 @@ ldbm_back_referrals(
}
if( refs != NULL ) ber_bvarray_free( refs );
rs->sr_ref = NULL;
rs->sr_matched = NULL;
}
cache_return_entry_r( &li->li_cache, e );

4
servers/slapd/back-ldbm/search.c
View file

@ -111,6 +111,8 @@ ldbm_back_search(
ber_bvarray_free( rs->sr_ref );
ber_memfree( matched_dn.bv_val );
rs->sr_ref = NULL;
rs->sr_matched = NULL;
return LDAP_REFERRAL;
}
@ -155,6 +157,8 @@ ldbm_back_search(
}
ber_memfree( matched_dn.bv_val );
rs->sr_ref = NULL;
rs->sr_matched = NULL;
return LDAP_OTHER;
}