/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2006 The OpenLDAP Foundation.
* Portions Copyright 2001-2003 Pierangelo Masarati.
* Portions Copyright 1999-2003 Howard Chu.
* All rights reserved.
#include "../back-ldap/back-ldap.h"
#include "back-meta.h"
-static LDAP_REBIND_PROC meta_back_rebind;
+static LDAP_REBIND_PROC meta_back_default_rebind;
+
+/*
+ * a module could register a replacement for this function
+ */
+LDAP_REBIND_PROC *meta_back_rebind_f = meta_back_default_rebind;
static int
meta_back_single_bind(
Operation *op,
SlapReply *rs,
metaconn_t *mc,
- int candidate );
+ int candidate,
+ int massage );
int
meta_back_bind( Operation *op, SlapReply *rs )
metaconn_t *mc = NULL;
int rc = LDAP_OTHER,
- i, gotit = 0, isroot = 0;
+ i,
+ gotit = 0,
+ isroot = 0;
SlapReply *candidates = meta_back_candidates_get( op );
rs->sr_err = LDAP_SUCCESS;
- Debug( LDAP_DEBUG_ARGS, "meta_back_bind: dn: %s.\n%s%s",
- op->o_req_dn.bv_val, "", "" );
+ Debug( LDAP_DEBUG_ARGS, "%s meta_back_bind: dn=\"%s\".\n",
+ op->o_log_prefix, op->o_req_dn.bv_val, 0 );
+
+ /* the test on the bind method should be superfluous */
+ if ( op->orb_method == LDAP_AUTH_SIMPLE
+ && be_isroot_dn( op->o_bd, &op->o_req_ndn ) )
+ {
+ if ( !be_isroot_pw( op ) ) {
+ rs->sr_err = LDAP_INVALID_CREDENTIALS;
+ rs->sr_text = NULL;
+ send_ldap_result( op, rs );
+ return rs->sr_err;
+ }
+
+ if ( META_BACK_DEFER_ROOTDN_BIND( mi ) ) {
+ rs->sr_err = LDAP_SUCCESS;
+ rs->sr_text = NULL;
+ /* frontend will return success */
+ return rs->sr_err;
+ }
- if ( op->orb_method == LDAP_AUTH_SIMPLE && be_isroot_pw( op ) ) {
isroot = 1;
- ber_dupbv( &op->orb_edn, be_root_dn( op->o_bd ) );
}
/* we need meta_back_getconn() not send result even on error,
* because we want to intercept the error and make it
* invalidCredentials */
- mc = meta_back_getconn( op, rs, NULL, LDAP_BACK_DONTSEND );
+ mc = meta_back_getconn( op, rs, NULL, LDAP_BACK_BIND_SERR );
if ( !mc ) {
+ char buf[ SLAP_TEXT_BUFLEN ];
+
+ snprintf( buf, sizeof( buf ),
+ "meta_back_bind: no target "
+ "for dn \"%s\" (%d%s%s).",
+ op->o_req_dn.bv_val, rs->sr_err,
+ rs->sr_text ? ". " : "",
+ rs->sr_text ? rs->sr_text : "" );
Debug( LDAP_DEBUG_ANY,
- "meta_back_bind: no target "
- "for dn \"%s\" (%d: %s).\n",
- op->o_req_dn.bv_val, rs->sr_err,
- rs->sr_text ? rs->sr_text : "" );
+ "%s %s\n",
+ op->o_log_prefix, buf, 0 );
+
/* FIXME: there might be cases where we don't want
* to map the error onto invalidCredentials */
switch ( rs->sr_err ) {
/*
* Each target is scanned ...
*/
- mc->mc_auth_target = META_BOUND_NONE;
+ mc->mc_authz_target = META_BOUND_NONE;
for ( i = 0; i < mi->mi_ntargets; i++ ) {
int lerr;
Operation op2 = *op;
+ int massage = 1;
/*
* Skip non-candidates
}
if ( gotit == 0 ) {
+ /* set rc to LDAP_SUCCESS only if at least
+ * one candidate has been tried */
+ rc = LDAP_SUCCESS;
gotit = 1;
} else if ( isroot == 0 ) {
* ONE CANDIDATE ONLY!
*/
Debug( LDAP_DEBUG_ANY,
- "==>meta_back_bind: more than one"
- " candidate is trying to bind...\n",
- 0, 0, 0 );
+ "### %s meta_back_bind: more than one"
+ " candidate selected...\n",
+ op->o_log_prefix, 0, 0 );
}
- if ( isroot && !BER_BVISNULL( &mi->mi_targets[ i ].mt_pseudorootdn ) )
- {
+ if ( isroot ) {
+ if ( BER_BVISNULL( &mi->mi_targets[ i ].mt_pseudorootdn ) )
+ {
+ metasingleconn_t *msc = &mc->mc_conns[ i ];
+
+ /* skip the target if no pseudorootdn is provided */
+ if ( !BER_BVISNULL( &msc->msc_bound_ndn ) ) {
+ ch_free( msc->msc_bound_ndn.bv_val );
+ BER_BVZERO( &msc->msc_bound_ndn );
+ }
+
+ if ( LDAP_BACK_SAVECRED( mi ) &&
+ !BER_BVISNULL( &msc->msc_cred ) )
+ {
+ /* destroy sensitive data */
+ memset( msc->msc_cred.bv_val, 0,
+ msc->msc_cred.bv_len );
+ ch_free( msc->msc_cred.bv_val );
+ BER_BVZERO( &msc->msc_cred );
+ }
+
+ continue;
+ }
+
op2.o_req_dn = mi->mi_targets[ i ].mt_pseudorootdn;
op2.o_req_ndn = mi->mi_targets[ i ].mt_pseudorootdn;
op2.orb_cred = mi->mi_targets[ i ].mt_pseudorootpw;
op2.orb_method = LDAP_AUTH_SIMPLE;
+
+ massage = 0;
}
- lerr = meta_back_single_bind( &op2, rs, mc, i );
+ lerr = meta_back_single_bind( &op2, rs, mc, i, massage );
+
if ( lerr != LDAP_SUCCESS ) {
- rs->sr_err = lerr;
+ rc = rs->sr_err = lerr;
candidates[ i ].sr_tag = META_NOT_CANDIDATE;
+ break;
+ }
+ }
- if ( META_BACK_ONERR_STOP( mi ) ) {
- rc = rs->sr_err;
- break;
+ /* must re-insert if local DN changed as result of bind */
+ if ( rc == LDAP_SUCCESS ) {
+ if ( isroot ) {
+ mc->mc_authz_target = META_BOUND_ALL;
+ ber_dupbv( &op->orb_edn, be_root_dn( op->o_bd ) );
+ }
+
+ if ( !dn_match( &op->o_req_ndn, &mc->mc_local_ndn ) ) {
+ int lerr;
+
+ /* wait for all other ops to release the connection */
+retry_lock:;
+ ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
+ if ( mc->mc_refcnt > 1 ) {
+ ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
+ ldap_pvt_thread_yield();
+ goto retry_lock;
+ }
+
+ assert( mc->mc_refcnt == 1 );
+ mc = avl_delete( &mi->mi_conninfo.lai_tree, (caddr_t)mc,
+ meta_back_conn_cmp );
+ assert( mc != NULL );
+
+ ber_bvreplace( &mc->mc_local_ndn, &op->o_req_ndn );
+ lerr = avl_insert( &mi->mi_conninfo.lai_tree, (caddr_t)mc,
+ meta_back_conn_cmp, meta_back_conn_dup );
+ ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
+ if ( lerr == -1 ) {
+ for ( i = 0; i < mi->mi_ntargets; ++i ) {
+ if ( mc->mc_conns[ i ].msc_ld != NULL ) {
+ meta_clear_one_candidate( &mc->mc_conns[ i ] );
+ }
+ }
+
+ /* we can do this because mc_refcnt == 1 */
+ mc->mc_refcnt = 0;
+ meta_back_conn_free( mc );
+ mc = NULL;
}
-
- } else {
- rc = LDAP_SUCCESS;
}
}
- if ( isroot ) {
- mc->mc_auth_target = META_BOUND_ALL;
+ if ( mc != NULL ) {
+ meta_back_release_conn( op, mc );
}
- meta_back_release_conn( op, mc );
-
/*
* rc is LDAP_SUCCESS if at least one bind succeeded,
* err is the last error that occurred during a bind;
- * if at least (and at most?) one bind succeedes, fine.
+ * if at least (and at most?) one bind succeeds, fine.
*/
if ( rc != LDAP_SUCCESS ) {
*/
if ( rs->sr_err == LDAP_SUCCESS && gotit == 0 ) {
rs->sr_err = LDAP_INVALID_CREDENTIALS;
+ } else {
+ rs->sr_err = slap_map_api2result( rs );
}
-
- rs->sr_err = slap_map_api2result( rs );
send_ldap_result( op, rs );
return rs->sr_err;
+
}
return LDAP_SUCCESS;
Operation *op,
SlapReply *rs,
metaconn_t *mc,
- int candidate )
+ int candidate,
+ int massage )
{
metainfo_t *mi = ( metainfo_t * )op->o_bd->be_private;
metatarget_t *mt = &mi->mi_targets[ candidate ];
struct berval mdn = BER_BVNULL;
- dncookie dc;
metasingleconn_t *msc = &mc->mc_conns[ candidate ];
int msgid,
rebinding = 0;
+
+ if ( !BER_BVISNULL( &msc->msc_bound_ndn ) ) {
+ ch_free( msc->msc_bound_ndn.bv_val );
+ BER_BVZERO( &msc->msc_bound_ndn );
+ }
+
+ if ( LDAP_BACK_SAVECRED( mi ) && !BER_BVISNULL( &msc->msc_cred ) ) {
+ /* destroy sensitive data */
+ memset( msc->msc_cred.bv_val, 0, msc->msc_cred.bv_len );
+ ch_free( msc->msc_cred.bv_val );
+ BER_BVZERO( &msc->msc_cred );
+ }
+
/*
* Rewrite the bind dn if needed
*/
- dc.target = &mi->mi_targets[ candidate ];
- dc.conn = op->o_conn;
- dc.rs = rs;
- dc.ctx = "bindDN";
+ if ( massage ) {
+ dncookie dc;
- if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
- send_ldap_result( op, rs );
- return -1;
+ dc.target = mt;
+ dc.conn = op->o_conn;
+ dc.rs = rs;
+ dc.ctx = "bindDN";
+
+ if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
+ send_ldap_result( op, rs );
+ return -1;
+ }
+
+ } else {
+ mdn = op->o_req_dn;
}
/* FIXME: this fixes the bind problem right now; we need
* to use the asynchronous version to get the "matched"
* and more in case of failure ... */
- /* FIXME: should be check if at least some of the op->o_ctrls
+ /* FIXME: should we check if at least some of the op->o_ctrls
* can/should be passed? */
rebind:;
rs->sr_err = ldap_sasl_bind( msc->msc_ld, mdn.bv_val,
op->o_ctrls, NULL, &msgid );
if ( rs->sr_err == LDAP_SUCCESS ) {
LDAPMessage *res;
- struct timeval tv = { 0, 100000 };
+ struct timeval tv;
int rc;
int nretries = mt->mt_nretries;
+ char buf[ SLAP_TEXT_BUFLEN ];
+
+ LDAP_BACK_TV_SET( &tv );
/*
* handle response!!!
*/
retry:;
- tv.tv_sec = 0;
- tv.tv_usec = META_BIND_TIMEOUT;
- switch ( ldap_result( msc->msc_ld, msgid, 0, &tv, &res ) ) {
+ switch ( ldap_result( msc->msc_ld, msgid, LDAP_MSG_ALL, &tv, &res ) ) {
case 0:
- Debug( LDAP_DEBUG_ANY,
- "%s meta_back_single_bind: "
+ snprintf( buf, sizeof( buf ),
"ldap_result=0 nretries=%d%s\n",
- op->o_log_prefix, nretries,
- rebinding ? " rebinding" : "" );
+ nretries, rebinding ? " rebinding" : "" );
+ Debug( LDAP_DEBUG_ANY,
+ "%s meta_back_single_bind[%d]: %s.\n",
+ op->o_log_prefix, candidate, buf );
if ( nretries != META_RETRY_NEVER ) {
ldap_pvt_thread_yield();
if ( nretries > 0 ) {
nretries--;
}
- tv.tv_sec = 0;
- tv.tv_usec = 100000;
+ tv = mt->mt_bind_timeout;
goto retry;
}
rs->sr_err = LDAP_BUSY;
ldap_abandon_ext( msc->msc_ld, msgid, NULL, NULL );
}
+ snprintf( buf, sizeof( buf ),
+ "err=%d nretries=%d",
+ rs->sr_err, nretries );
Debug( LDAP_DEBUG_ANY,
- "### %s meta_back_single_bind: "
- "err=%d nretries=%d\n",
- op->o_log_prefix, rs->sr_err, nretries );
+ "### %s meta_back_single_bind[%d]: %s.\n",
+ op->o_log_prefix, candidate, buf );
rc = slap_map_api2result( rs );
if ( rs->sr_err == LDAP_UNAVAILABLE && nretries != META_RETRY_NEVER ) {
- ldap_pvt_thread_mutex_lock( &mi->mi_conn_mutex );
- if ( mc->mc_refcnt == 1 ) {
- ldap_unbind_ext_s( msc->msc_ld, NULL, NULL );
- msc->msc_ld = NULL;
- msc->msc_bound = 0;
-
- ( void )rewrite_session_delete( mt->mt_rwmap.rwm_rw, op->o_conn );
-
- /* mc here must be the regular mc,
- * reset and ready for init */
- rc = meta_back_init_one_conn( op, rs,
- mt, msc, LDAP_BACK_DONTSEND );
-
- } else {
- /* can't do anything about it */
- rc = 0;
- }
-
- ldap_pvt_thread_mutex_unlock( &mi->mi_conn_mutex );
-
+ rc = meta_back_retry( op, rs, mc, candidate, LDAP_BACK_DONTSEND );
if ( rc ) {
if ( nretries > 0 ) {
nretries--;
}
ber_bvreplace( &msc->msc_bound_ndn, &op->o_req_dn );
- msc->msc_bound = META_BOUND;
- mc->mc_auth_target = candidate;
+ LDAP_BACK_CONN_ISBOUND_SET( msc );
+ mc->mc_authz_target = candidate;
if ( LDAP_BACK_SAVECRED( mi ) ) {
ber_bvreplace( &msc->msc_cred, &op->orb_cred );
- ldap_set_rebind_proc( msc->msc_ld, meta_back_rebind, msc );
+ ldap_set_rebind_proc( msc->msc_ld, meta_back_rebind_f, msc );
}
if ( mi->mi_cache.ttl != META_DNCACHE_DISABLED
metatarget_t *mt = &mi->mi_targets[ candidate ];
metasingleconn_t *msc = &mc->mc_conns[ candidate ];
int rc;
- struct berval cred = BER_BVC( "" );
+ static struct berval cred = BER_BVC( "" );
int msgid,
rebinding = 0,
save_nretries = nretries;
+ assert( !LDAP_BACK_CONN_ISBOUND( msc ) );
+
/*
* Otherwise an anonymous bind is performed
* (note: if the target was already bound, the anonymous
BER_BVZERO( &msc->msc_bound_ndn );
}
- if ( !BER_BVISNULL( &msc->msc_cred ) ) {
+ if ( LDAP_BACK_SAVECRED( mi ) && !BER_BVISNULL( &msc->msc_cred ) ) {
/* destroy sensitive data */
memset( msc->msc_cred.bv_val, 0, msc->msc_cred.bv_len );
ber_memfree( msc->msc_cred.bv_val );
NULL, NULL, &msgid );
if ( rc == LDAP_SUCCESS ) {
LDAPMessage *res;
- struct timeval tv = { 0, 100000 };
+ struct timeval tv;
+ char buf[ SLAP_TEXT_BUFLEN ];
+
+ LDAP_BACK_TV_SET( &tv );
/*
* handle response!!!
*/
retry:;
- tv.tv_sec = 0;
- tv.tv_usec = META_BIND_TIMEOUT;
- switch ( ldap_result( msc->msc_ld, msgid, 0, &tv, &res ) ) {
+ switch ( ldap_result( msc->msc_ld, msgid, LDAP_MSG_ALL, &tv, &res ) ) {
case 0:
+ snprintf( buf, sizeof( buf ),
+ "ldap_result=0 nretries=%d%s",
+ nretries, rebinding ? " rebinding" : "" );
Debug( LDAP_DEBUG_ANY,
- "%s meta_back_single_dobind: "
- "ldap_result=0 nretries=%d%s\n",
- op->o_log_prefix, nretries,
- rebinding ? " rebinding" : "" );
+ "%s meta_back_single_dobind[%d]: %s.\n",
+ op->o_log_prefix, candidate, buf );
if ( nretries != META_RETRY_NEVER ) {
ldap_pvt_thread_yield();
if ( nretries > 0 ) {
nretries--;
}
- tv.tv_sec = 0;
- tv.tv_usec = 100000;
+ tv = mt->mt_bind_timeout;
goto retry;
}
ldap_abandon_ext( msc->msc_ld, msgid, NULL, NULL );
}
+ snprintf( buf, sizeof( buf ),
+ "err=%d nretries=%d",
+ rs->sr_err, nretries );
Debug( LDAP_DEBUG_ANY,
- "### %s meta_back_single_dobind: "
- "err=%d nretries=%d\n",
- op->o_log_prefix, rs->sr_err, nretries );
+ "### %s meta_back_single_dobind[%d]: %s.\n",
+ op->o_log_prefix, candidate, buf );
rc = slap_map_api2result( rs );
if ( rc == LDAP_UNAVAILABLE && nretries != META_RETRY_NEVER ) {
+ /* NOTE: we do not use meta_back_retry() here
+ * to avoid circular loops; mc_mutex is set
+ * by the caller */
if ( dolock ) {
- ldap_pvt_thread_mutex_lock( &mi->mi_conn_mutex );
+ ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
}
if ( mc->mc_refcnt == 1 ) {
- ldap_unbind_ext_s( msc->msc_ld, NULL, NULL );
- msc->msc_ld = NULL;
- msc->msc_bound = 0;
+ meta_clear_one_candidate( msc );
+ LDAP_BACK_CONN_ISBOUND_CLEAR( msc );
( void )rewrite_session_delete( mt->mt_rwmap.rwm_rw, op->o_conn );
/* mc here must be the regular mc,
* reset and ready for init */
rc = meta_back_init_one_conn( op, rs,
- mt, msc, LDAP_BACK_DONTSEND );
-
+ mt, mc, candidate,
+ LDAP_BACK_CONN_ISPRIV( mc ),
+ LDAP_BACK_DONTSEND );
} else {
/* can't do anything about it */
}
if ( dolock ) {
- ldap_pvt_thread_mutex_unlock( &mi->mi_conn_mutex );
+ ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
}
if ( rc == LDAP_SUCCESS ) {
}
} else {
+ rs->sr_err = rc;
rc = slap_map_api2result( rs );
}
Debug( LDAP_DEBUG_TRACE,
"%s meta_back_dobind: conn=%ld%s\n",
- op->o_log_prefix, mc->mc_conn->c_connid,
+ op->o_log_prefix,
+ LDAP_BACK_PCONN_ID( mc->mc_conn ),
isroot ? " (isroot)" : "" );
ldap_pvt_thread_mutex_lock( &mc->mc_mutex );
/*
* all the targets are bound as pseudoroot
*/
- if ( mc->mc_auth_target == META_BOUND_ALL ) {
+ if ( mc->mc_authz_target == META_BOUND_ALL ) {
bound = 1;
goto done;
}
metatarget_t *mt = &mi->mi_targets[ i ];
metasingleconn_t *msc = &mc->mc_conns[ i ];
int rc;
+ char *rootdn = NULL;
/*
* Not a candidate
/*
* If the target is already bound it is skipped
*/
- if ( msc->msc_bound == META_BOUND && mc->mc_auth_target == i ) {
+ if ( LDAP_BACK_CONN_ISBOUND( msc ) || LDAP_BACK_CONN_ISANON( msc ) ) {
++bound;
-
- Debug( LDAP_DEBUG_TRACE, "%s meta_back_dobind[%d]: "
- "authcTarget\n",
- op->o_log_prefix, i, 0 );
continue;
}
op2.orb_cred = mi->mi_targets[ i ].mt_pseudorootpw;
op2.orb_method = LDAP_AUTH_SIMPLE;
- rc = meta_back_single_bind( &op2, rs, mc, i );
+ rootdn = mi->mi_targets[ i ].mt_pseudorootdn.bv_val;
+
+ rc = meta_back_single_bind( &op2, rs, mc, i, 0 );
} else {
rc = meta_back_single_dobind( op, rs, mc, i,
}
if ( rc != LDAP_SUCCESS ) {
- rs->sr_err = slap_map_api2result( rs );
+ char buf[ SLAP_TEXT_BUFLEN ];
- Debug( LDAP_DEBUG_ANY, "%s meta_back_dobind[%d]: "
- "(anonymous) err=%d\n",
- op->o_log_prefix, i, rc );
+ snprintf( buf, sizeof( buf ),
+ "meta_back_dobind[%d]: (%s) err=%d.",
+ i, rootdn ? rootdn : "anonymous", rc );
+ Debug( LDAP_DEBUG_ANY,
+ "%s %s\n",
+ op->o_log_prefix, buf, 0 );
/*
* null cred bind should always succeed
* due to technical reasons (remote host down?)
* so better clear the handle
*/
- candidates[ i ].sr_tag = META_NOT_CANDIDATE;
+ /* leave the target candidate, but record the error for later use */
+ candidates[ i ].sr_err = rc;
if ( META_BACK_ONERR_STOP( mi ) ) {
bound = 0;
goto done;
continue;
} /* else */
- Debug( LDAP_DEBUG_TRACE, "%s meta_back_dobind[%d]: "
- "(anonymous)\n",
- op->o_log_prefix, i, 0 );
-
- msc->msc_bound = META_ANONYMOUS;
+ Debug( LDAP_DEBUG_TRACE,
+ "%s meta_back_dobind[%d]: "
+ "(%s)\n",
+ op->o_log_prefix, i,
+ rootdn ? rootdn : "anonymous" );
+
+ if ( rootdn ) {
+ LDAP_BACK_CONN_ISBOUND_SET( msc );
+ } else {
+ LDAP_BACK_CONN_ISANON_SET( msc );
+ }
++bound;
}
Debug( LDAP_DEBUG_TRACE,
"%s meta_back_dobind: conn=%ld bound=%d\n",
- op->o_log_prefix, mc->mc_conn->c_connid, bound );
+ op->o_log_prefix, LDAP_BACK_PCONN_ID( mc->mc_conn ), bound );
if ( bound == 0 ) {
meta_back_release_conn( op, mc );
}
/*
- * meta_back_rebind
+ * meta_back_default_rebind
*
* This is a callback used for chasing referrals using the same
* credentials as the original user on this session.
*/
static int
-meta_back_rebind(
+meta_back_default_rebind(
LDAP *ld,
LDAP_CONST char *url,
ber_tag_t request,
int i,
rerr = LDAP_SUCCESS;
- char *rmsg = NULL;
- char *rmatch = NULL;
- int free_rmsg = 0,
- free_rmatch = 0;
+ char *rmsg = NULL,
+ *rmatch = NULL;
+ const char *save_rmsg = NULL,
+ *save_rmatch = NULL;
+ void *rmatch_ctx = NULL;
if ( candidate != META_TARGET_NONE ) {
metasingleconn_t *msc = &mc->mc_conns[ candidate ];
*/
ldap_get_option( msc->msc_ld,
LDAP_OPT_ERROR_STRING, &rmsg );
+ if ( rmsg != NULL && rmsg[ 0 ] == '\0' ) {
+ ldap_memfree( rmsg );
+ rmsg = NULL;
+ }
+
ldap_get_option( msc->msc_ld,
LDAP_OPT_MATCHED_DN, &rmatch );
- rerr = rs->sr_err = slap_map_api2result( rs );
-
- if ( rmsg ) {
- free_rmsg = 1;
- }
- if ( rmatch ) {
- free_rmatch = 1;
+ if ( rmatch != NULL && rmatch[ 0 ] == '\0' ) {
+ ldap_memfree( rmatch );
+ rmatch = NULL;
}
+ rerr = rs->sr_err = slap_map_api2result( rs );
+
Debug(LDAP_DEBUG_ANY,
"==> meta_back_op_result: target"
" <%d> sending msg \"%s\""
*/
ldap_get_option( msc->msc_ld,
LDAP_OPT_ERROR_STRING, &msg );
+ if ( msg != NULL && msg[ 0 ] == '\0' ) {
+ ldap_memfree( msg );
+ msg = NULL;
+ }
+
ldap_get_option( msc->msc_ld,
LDAP_OPT_MATCHED_DN, &match );
+ if ( match != NULL && match[ 0 ] == '\0' ) {
+ ldap_memfree( match );
+ match = NULL;
+ }
+
rs->sr_err = slap_map_api2result( rs );
Debug(LDAP_DEBUG_ANY,
switch ( rs->sr_err ) {
default:
rerr = rs->sr_err;
- if ( rmsg ) {
- ber_memfree( rmsg );
+ if ( msg != NULL ) {
+ if ( rmsg ) {
+ ldap_memfree( rmsg );
+ }
+ rmsg = msg;
+ msg = NULL;
}
- rmsg = msg;
- free_rmsg = 1;
- msg = NULL;
- if ( rmatch ) {
- ber_memfree( rmatch );
+ if ( match != NULL ) {
+ if ( rmatch ) {
+ ldap_memfree( rmatch );
+ }
+ rmatch = match;
+ match = NULL;
}
- rmatch = match;
- free_rmatch = 1;
- match = NULL;
break;
}
+
+ if ( msg ) {
+ ldap_memfree( msg );
+ }
- /* better test the pointers before freeing? */
if ( match ) {
- free( match );
- }
- if ( msg ) {
- free( msg );
+ ldap_memfree( match );
}
}
}
}
rs->sr_err = rerr;
- rs->sr_text = rmsg;
- rs->sr_matched = rmatch;
+ if ( rmsg != NULL ) {
+ save_rmsg = rs->sr_text;
+ 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 ) {
+ ldap_memfree( rmatch );
+ rmatch_ctx = op->o_tmpmemctx;
+ rmatch = pdn.bv_val;
+ }
+ save_rmatch = rs->sr_matched;
+ rs->sr_matched = rmatch;
+ }
send_ldap_result( op, rs );
- if ( free_rmsg ) {
+ if ( rmsg != NULL ) {
ber_memfree( rmsg );
+ rs->sr_text = save_rmsg;
}
- if ( free_rmatch ) {
- ber_memfree( rmatch );
+ if ( rmatch != NULL ) {
+ ber_memfree_x( rmatch, rmatch_ctx );
+ rs->sr_matched = save_rmatch;
}
- rs->sr_text = NULL;
- rs->sr_matched = NULL;
return ( ( rerr == LDAP_SUCCESS ) ? 0 : -1 );
}
projects / openldap / blobdiff