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

prettify matchedDN; fix memory handling

Browse Source
This commit is contained in:
Pierangelo Masarati 2005-08-27 19:21:43 +00:00
parent 97600bf23c
commit 39998dfe8d
2 changed files with 64 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
servers/slapd/back-meta/bind.c
View File

@ -667,8 +667,6 @@ meta_back_op_result(
rerr = LDAP_SUCCESS; rerr = LDAP_SUCCESS;
char *rmsg = NULL; char *rmsg = NULL;
char *rmatch = NULL; char *rmatch = NULL;
int free_rmsg = 0,
free_rmatch = 0;
if ( candidate != META_TARGET_NONE ) { if ( candidate != META_TARGET_NONE ) {
metasingleconn_t *msc = &mc->mc_conns[ candidate ]; metasingleconn_t *msc = &mc->mc_conns[ candidate ];
@ -685,16 +683,19 @@ meta_back_op_result(
*/ */
ldap_get_option( msc->msc_ld, ldap_get_option( msc->msc_ld,
LDAP_OPT_ERROR_STRING, &rmsg ); LDAP_OPT_ERROR_STRING, &rmsg );
if ( rmsg != NULL && rmsg[ 0 ] == '\0' ) {
ldap_memfree( rmsg );
rmsg = NULL;
}
ldap_get_option( msc->msc_ld, ldap_get_option( msc->msc_ld,
LDAP_OPT_MATCHED_DN, &rmatch ); LDAP_OPT_MATCHED_DN, &rmatch );
rerr = rs->sr_err = slap_map_api2result( rs ); if ( rmatch != NULL && rmatch[ 0 ] == '\0' ) {
ldap_memfree( rmatch );
rmatch = NULL;
}
if ( rmsg ) { rerr = rs->sr_err = slap_map_api2result( rs );
free_rmsg = 1;
}
if ( rmatch ) {
free_rmatch = 1;
}
Debug(LDAP_DEBUG_ANY, Debug(LDAP_DEBUG_ANY,
"==> meta_back_op_result: target" "==> meta_back_op_result: target"
@ -722,8 +723,18 @@ meta_back_op_result(
*/ */
ldap_get_option( msc->msc_ld, ldap_get_option( msc->msc_ld,
LDAP_OPT_ERROR_STRING, &msg ); LDAP_OPT_ERROR_STRING, &msg );
if ( msg != NULL && msg[ 0 ] == '\0' ) {
ldap_memfree( msg );
msg = NULL;
}
ldap_get_option( msc->msc_ld, ldap_get_option( msc->msc_ld,
LDAP_OPT_MATCHED_DN, &match ); LDAP_OPT_MATCHED_DN, &match );
if ( match != NULL && match[ 0 ] == '\0' ) {
ldap_memfree( match );
match = NULL;
}
rs->sr_err = slap_map_api2result( rs ); rs->sr_err = slap_map_api2result( rs );
Debug(LDAP_DEBUG_ANY, Debug(LDAP_DEBUG_ANY,
@ -739,27 +750,29 @@ meta_back_op_result(
switch ( rs->sr_err ) { switch ( rs->sr_err ) {
default: default:
rerr = rs->sr_err; rerr = rs->sr_err;
if ( msg != NULL ) {
if ( rmsg ) { if ( rmsg ) {
ber_memfree( rmsg ); ldap_memfree( rmsg );
} }
rmsg = msg; rmsg = msg;
free_rmsg = 1;
msg = NULL; msg = NULL;
}
if ( match != NULL ) {
if ( rmatch ) { if ( rmatch ) {
ber_memfree( rmatch ); ldap_memfree( rmatch );
} }
rmatch = match; rmatch = match;
free_rmatch = 1;
match = NULL; match = NULL;
}
break; break;
} }
/* better test the pointers before freeing? */
if ( match ) {
free( match );
}
if ( msg ) { if ( msg ) {
free( msg ); ldap_memfree( msg );
}
if ( match ) {
ldap_memfree( match );
} }
} }
} }
@ -767,16 +780,35 @@ meta_back_op_result(
rs->sr_err = rerr; rs->sr_err = rerr;
rs->sr_text = rmsg; rs->sr_text = rmsg;
if ( rmatch != NULL ) {
struct berval dn, pdn;
ber_str2bv( rmatch, 0, 0, &dn );
if ( dnPretty( NULL, &dn, &pdn, op->o_tmpmemctx ) == LDAP_SUCCESS ) {
rs->sr_matched = pdn.bv_val;
ldap_memfree( rmatch );
rmatch = NULL;
} else {
rs->sr_matched = rmatch; rs->sr_matched = rmatch;
}
} else {
rs->sr_matched = NULL;
}
send_ldap_result( op, rs ); send_ldap_result( op, rs );
if ( free_rmsg ) { if ( rmsg != NULL ) {
ber_memfree( rmsg ); ber_memfree( rmsg );
} }
if ( free_rmatch ) { if ( rs->sr_matched != NULL ) {
ber_memfree( rmatch ); if ( rmatch == NULL ) {
ber_memfree_x( rs->sr_matched, op->o_tmpmemctx );
} else {
ldap_memfree( rmatch );
}
rs->sr_matched = NULL;
} }
rs->sr_text = NULL; rs->sr_text = NULL;
rs->sr_matched = NULL;
return ( ( rerr == LDAP_SUCCESS ) ? 0 : -1 ); return ( ( rerr == LDAP_SUCCESS ) ? 0 : -1 );
} }

4
servers/slapd/back-meta/search.c
View File

@ -759,7 +759,7 @@ really_bad:;
} }
} else if ( sres == LDAP_NO_SUCH_OBJECT ) { } else if ( sres == LDAP_NO_SUCH_OBJECT ) {
matched = ch_strdup( op->o_bd->be_suffix[ 0 ].bv_val ); matched = op->o_bd->be_suffix[ 0 ].bv_val;
} }
#if 0 #if 0
@ -804,7 +804,7 @@ really_bad:;
rs->sr_ref = NULL; rs->sr_ref = NULL;
finish:; finish:;
if ( matched ) { if ( matched && matched != op->o_bd->be_suffix[ 0 ].bv_val ) {
op->o_tmpfree( matched, op->o_tmpmemctx ); op->o_tmpfree( matched, op->o_tmpmemctx );
} }