Operation *op,
struct berval *filter )
{
- struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private;
+ ldapinfo_t *li = (ldapinfo_t *) op->o_bd->be_private;
char *ptr;
int gotit = 0;
if ( strncmp( ptr, bv_true.bv_val, bv_true.bv_len ) == 0 ) {
oldbv = &bv_true;
- if ( li->flags & LDAP_BACK_F_SUPPORT_T_F ) {
+ if ( li->li_flags & LDAP_BACK_F_SUPPORT_T_F ) {
newbv = &bv_t;
} else {
} else if ( strncmp( ptr, bv_false.bv_val, bv_false.bv_len ) == 0 )
{
oldbv = &bv_false;
- if ( li->flags & LDAP_BACK_F_SUPPORT_T_F ) {
+ if ( li->li_flags & LDAP_BACK_F_SUPPORT_T_F ) {
newbv = &bv_f;
} else {
Operation *op,
SlapReply *rs )
{
- struct ldapconn *lc;
+ ldapconn_t *lc;
struct timeval tv;
- time_t stoptime;
+ time_t stoptime = (time_t)-1;
LDAPMessage *res,
*e;
int rc = 0,
int freetext = 0;
int do_retry = 1;
LDAPControl **ctrls = NULL;
+ /* FIXME: shouldn't this be null? */
+ const char *save_matched = rs->sr_matched;
lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
if ( !lc || !ldap_back_dobind( lc, op, rs, LDAP_BACK_SENDERR ) ) {
stoptime = op->o_time + op->ors_tlimit;
} else {
- tv.tv_sec = 0;
+ LDAP_BACK_TV_SET( &tv );
}
if ( op->ors_attrs ) {
op->ors_slimit, &msgid );
if ( rs->sr_err != LDAP_SUCCESS ) {
-fail:;
switch ( rs->sr_err ) {
case LDAP_SERVER_DOWN:
if ( do_retry ) {
do_retry = 0;
- if ( ldap_back_retry( lc, op, rs, LDAP_BACK_DONTSEND ) ) {
+ if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_DONTSEND ) ) {
goto retry;
}
}
- rc = ldap_back_op_result( lc, op, rs, msgid, LDAP_BACK_DONTSEND );
- ldap_back_freeconn( op, lc );
- lc = NULL;
+ if ( lc == NULL ) {
+ /* reset by ldap_back_retry ... */
+ rs->sr_err = slap_map_api2result( rs );
+
+ } else {
+ rc = ldap_back_op_result( lc, op, rs, msgid, 0, LDAP_BACK_DONTSEND );
+ ldap_back_freeconn( op, lc, 0 );
+ lc = NULL;
+ }
+
goto finish;
case LDAP_FILTER_ERROR:
}
if ( rc == 0 ) {
- tv.tv_sec = 0;
- tv.tv_usec = 100000;
+ LDAP_BACK_TV_SET( &tv );
ldap_pvt_thread_yield();
/* check time limit */
} else if ( rc == LDAP_RES_SEARCH_ENTRY ) {
Entry ent = { 0 };
struct berval bdn = BER_BVNULL;
- int abort = 0;
do_retry = 0;
rs->sr_attrs = op->ors_attrs;
rs->sr_operational_attrs = NULL;
rs->sr_flags = 0;
- abort = send_search_entry( op, rs );
+ rc = rs->sr_err = send_search_entry( op, rs );
if ( !BER_BVISNULL( &ent.e_name ) ) {
assert( ent.e_name.bv_val != bdn.bv_val );
free( ent.e_name.bv_val );
entry_clean( &ent );
}
ldap_msgfree( res );
- if ( abort ) {
- ldap_abandon_ext( lc->lc_ld, msgid, NULL, NULL );
+ if ( rc != LDAP_SUCCESS ) {
+ if ( rc == LDAP_UNAVAILABLE ) {
+ rc = rs->sr_err = LDAP_OTHER;
+ } else {
+ ldap_abandon_ext( lc->lc_ld, msgid, NULL, NULL );
+ }
goto finish;
}
/* cleanup */
if ( references ) {
- ldap_value_free( references );
+ ber_memvfree( (void **)references );
ch_free( rs->sr_ref );
rs->sr_ref = NULL;
}
}
if ( match.bv_val != NULL ) {
+#ifndef LDAP_NULL_IS_NULL
if ( match.bv_val[ 0 ] == '\0' ) {
LDAP_FREE( match.bv_val );
BER_BVZERO( &match );
- } else {
+ } else
+#endif /* LDAP_NULL_IS_NULL */
+ {
match.bv_len = strlen( match.bv_val );
}
}
+#ifndef LDAP_NULL_IS_NULL
+ if ( rs->sr_text != NULL && rs->sr_text[ 0 ] == '\0' ) {
+ LDAP_FREE( (char *)rs->sr_text );
+ rs->sr_text = NULL;
+ }
+#endif /* LDAP_NULL_IS_NULL */
/* cleanup */
if ( references ) {
- ldap_value_free( references );
+ ber_memvfree( (void **)references );
}
rc = 0;
if ( rc == -1 ) {
if ( do_retry ) {
do_retry = 0;
- if ( ldap_back_retry( lc, op, rs, LDAP_BACK_SENDERR ) ) {
+ if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
goto retry;
}
}
rs->sr_err = LDAP_SERVER_DOWN;
- goto fail;
+ rs->sr_err = slap_map_api2result( rs );
+ goto finish;
}
/*
* Rewrite the matched portion of the search base, if required
*/
if ( !BER_BVISNULL( &match ) && !BER_BVISEMPTY( &match ) ) {
- rs->sr_matched = match.bv_val;
+ struct berval pmatch;
+
+ if ( dnPretty( NULL, &match, &pmatch, op->o_tmpmemctx ) == LDAP_SUCCESS ) {
+ rs->sr_matched = pmatch.bv_val;
+ LDAP_FREE( match.bv_val );
+
+ } else {
+ rs->sr_matched = match.bv_val;
+ }
}
if ( rs->sr_v2ref ) {
rs->sr_ctrls = NULL;
}
- if ( match.bv_val ) {
- rs->sr_matched = NULL;
- LDAP_FREE( match.bv_val );
+ if ( rs->sr_matched != NULL && rs->sr_matched != save_matched ) {
+ if ( rs->sr_matched != match.bv_val ) {
+ ber_memfree_x( (char *)rs->sr_matched, op->o_tmpmemctx );
+
+ } else {
+ LDAP_FREE( match.bv_val );
+ }
+ rs->sr_matched = save_matched;
}
if ( !BER_BVISNULL( &filter ) && filter.bv_val != op->ors_filterstr.bv_val ) {
ldap_back_release_conn( op, rs, lc );
}
- return rc;
+ return rs->sr_err;
}
static int
if ( slap_bv2ad( &a, &attr->a_desc, &text )
!= LDAP_SUCCESS )
{
- if ( slap_bv2undef_ad( &a, &attr->a_desc, &text )
- != LDAP_SUCCESS )
+ if ( slap_bv2undef_ad( &a, &attr->a_desc, &text,
+ SLAP_AD_PROXIED ) != LDAP_SUCCESS )
{
Debug( LDAP_DEBUG_ANY,
- "slap_bv2undef_ad(%s): %s\n",
- a.bv_val, text, 0 );
+ "%s ldap_build_entry: "
+ "slap_bv2undef_ad(%s): %s\n",
+ op->o_log_prefix, a.bv_val, text );
ch_free( attr );
continue;
}
Entry **ent
)
{
- struct ldapconn *lc;
+ ldapconn_t *lc;
int rc = 1,
do_not_cache;
struct berval bdn;
if ( rc != LDAP_SUCCESS ) {
if ( rc == LDAP_SERVER_DOWN && do_retry ) {
do_retry = 0;
- if ( ldap_back_retry( lc, op, &rs, LDAP_BACK_DONTSEND ) ) {
+ if ( ldap_back_retry( &lc, op, &rs, LDAP_BACK_DONTSEND ) ) {
goto retry;
}
}