meta_send_entry(
Operation *op,
SlapReply *rs,
- struct metaconn *lc,
+ metaconn_t *mc,
int i,
LDAPMessage *e );
Operation *op,
SlapReply *rs,
dncookie *dc,
- struct metasingleconn *msc,
+ metasingleconn_t *msc,
int candidate,
- int *msgidp
+ SlapReply *candidates
)
{
- struct metainfo *mi = ( struct metainfo * )op->o_bd->be_private;
- struct berval realbase = op->o_req_dn;
- int realscope = op->ors_scope;
- ber_len_t suffixlen = 0;
- struct berval mbase = BER_BVNULL;
- struct berval mfilter = BER_BVNULL;
- char **mapped_attrs = NULL;
- int rc;
+ metainfo_t *mi = ( metainfo_t * )op->o_bd->be_private;
+ struct berval realbase = op->o_req_dn;
+ int realscope = op->ors_scope;
+ ber_len_t suffixlen = 0;
+ struct berval mbase = BER_BVNULL;
+ struct berval mfilter = BER_BVNULL;
+ char **mapped_attrs = NULL;
+ int rc;
/* should we check return values? */
if ( op->ors_deref != -1 ) {
( void * )&op->ors_slimit);
}
- dc->rwmap = &mi->mi_targets[ candidate ]->mt_rwmap;
+ dc->target = &mi->mi_targets[ candidate ];
/*
* modifies the base according to the scope, if required
*/
- suffixlen = mi->mi_targets[ candidate ]->mt_nsuffix.bv_len;
+ suffixlen = mi->mi_targets[ candidate ].mt_nsuffix.bv_len;
if ( suffixlen > op->o_req_ndn.bv_len ) {
switch ( op->ors_scope ) {
case LDAP_SCOPE_SUBTREE:
* the requested searchBase already passed
* thru the candidate analyzer...
*/
- if ( dnIsSuffix( &mi->mi_targets[ candidate ]->mt_nsuffix,
+ if ( dnIsSuffix( &mi->mi_targets[ candidate ].mt_nsuffix,
&op->o_req_ndn ) )
{
- realbase = mi->mi_targets[ candidate ]->mt_nsuffix;
+ realbase = mi->mi_targets[ candidate ].mt_nsuffix;
+#ifdef LDAP_SCOPE_SUBORDINATE
+ if ( mi->mi_targets[ candidate ].mt_scope == LDAP_SCOPE_SUBORDINATE ) {
+ realscope = LDAP_SCOPE_SUBORDINATE;
+ }
+#endif /* LDAP_SCOPE_SUBORDINATE */
} else {
/*
}
break;
+#ifdef LDAP_SCOPE_SUBORDINATE
+ case LDAP_SCOPE_SUBORDINATE:
+#endif /* LDAP_SCOPE_SUBORDINATE */
case LDAP_SCOPE_ONELEVEL:
{
- struct berval rdn = mi->mi_targets[ candidate ]->mt_nsuffix;
+ struct berval rdn = mi->mi_targets[ candidate ].mt_nsuffix;
rdn.bv_len -= op->o_req_ndn.bv_len + STRLENOF( "," );
if ( dnIsOneLevelRDN( &rdn )
- && dnIsSuffix( &mi->mi_targets[ candidate ]->mt_nsuffix, &op->o_req_ndn ) )
+ && dnIsSuffix( &mi->mi_targets[ candidate ].mt_nsuffix, &op->o_req_ndn ) )
{
/*
* if there is exactly one level,
* make the target suffix the new
* base, and make scope "base"
*/
- realbase = mi->mi_targets[ candidate ]->mt_nsuffix;
- realscope = LDAP_SCOPE_BASE;
+ realbase = mi->mi_targets[ candidate ].mt_nsuffix;
+#ifdef LDAP_SCOPE_SUBORDINATE
+ if ( op->ors_scope == LDAP_SCOPE_SUBORDINATE ) {
+ if ( mi->mi_targets[ candidate ].mt_scope == LDAP_SCOPE_SUBORDINATE ) {
+ realscope = LDAP_SCOPE_SUBORDINATE;
+ } else {
+ realscope = LDAP_SCOPE_SUBTREE;
+ }
+ } else
+#endif /* LDAP_SCOPE_SUBORDINATE */
+ {
+ realscope = LDAP_SCOPE_BASE;
+ }
break;
} /* else continue with the next case */
}
/*
* Maps required attributes
*/
- rc = ldap_back_map_attrs( &mi->mi_targets[ candidate ]->mt_rwmap.rwm_at,
- op->ors_attrs, BACKLDAP_MAP,
- &mapped_attrs );
+ rc = ldap_back_map_attrs( &mi->mi_targets[ candidate ].mt_rwmap.rwm_at,
+ op->ors_attrs, BACKLDAP_MAP, &mapped_attrs );
if ( rc != LDAP_SUCCESS ) {
/*
* this target is no longer candidate
rc = ldap_search_ext( msc->msc_ld,
mbase.bv_val, realscope, mfilter.bv_val,
mapped_attrs, op->ors_attrsonly,
- op->o_ctrls, NULL,
- NULL, op->ors_slimit, msgidp );
+ op->o_ctrls, NULL, NULL, op->ors_slimit,
+ &candidates[ candidate ].sr_msgid );
if ( rc == LDAP_SUCCESS ) {
rc = 1;
} else {
- *msgidp = -1;
+ candidates[ candidate ].sr_msgid = -1;
rc = 0;
}
done:;
if ( mapped_attrs ) {
free( mapped_attrs );
- mapped_attrs = NULL;
}
if ( mfilter.bv_val != op->ors_filterstr.bv_val ) {
free( mfilter.bv_val );
- BER_BVZERO( &mfilter );
}
if ( mbase.bv_val != realbase.bv_val ) {
free( mbase.bv_val );
- BER_BVZERO( &mbase );
}
return rc;
int
meta_back_search( Operation *op, SlapReply *rs )
{
- struct metainfo *mi = ( struct metainfo * )op->o_bd->be_private;
- struct metaconn *lc;
- struct metasingleconn *msc;
- struct timeval tv = { 0, 0 };
- LDAPMessage *res = NULL, *e;
- int rc = 0, sres = LDAP_SUCCESS;
- char *err = NULL;
- struct berval match = BER_BVNULL, mmatch = BER_BVNULL;
- BerVarray v2refs = NULL;
-
- int i, last = 0, ncandidates = 0,
- initial_candidates = 0, candidate_match = 0;
- dncookie dc;
-
- int is_ok = 0;
-
- void *savepriv;
-
- SlapReply *candidates = meta_back_candidates_get( op );
+ metainfo_t *mi = ( metainfo_t * )op->o_bd->be_private;
+ metaconn_t *mc;
+ struct timeval tv = { 0, 0 };
+ time_t stoptime;
+ LDAPMessage *res = NULL, *e;
+ int rc = 0, sres = LDAP_SUCCESS;
+ char *matched = NULL;
+ int last = 0, ncandidates = 0,
+ initial_candidates = 0, candidate_match = 0;
+ long i;
+ dncookie dc;
+ int is_ok = 0;
+ void *savepriv;
+ SlapReply *candidates = meta_back_candidates_get( op );
/*
* controls are set in ldap_back_dobind()
* FIXME: in case of values return filter, we might want
* to map attrs and maybe rewrite value
*/
- lc = meta_back_getconn( op, rs, NULL, LDAP_BACK_SENDERR );
- if ( !lc || !meta_back_dobind( lc, op, LDAP_BACK_SENDERR ) ) {
+ mc = meta_back_getconn( op, rs, NULL, LDAP_BACK_SENDERR );
+ if ( !mc || !meta_back_dobind( op, rs, mc, LDAP_BACK_SENDERR ) ) {
return rs->sr_err;
}
/*
* Inits searches
*/
- for ( i = 0, msc = &lc->mc_conns[ 0 ]; !META_LAST( msc ); ++i, ++msc ) {
+ for ( i = 0; i < mi->mi_ntargets; i++ ) {
+ metasingleconn_t *msc = &mc->mc_conns[ i ];
+
candidates[ i ].sr_msgid = -1;
+ candidates[ i ].sr_matched = NULL;
+ candidates[ i ].sr_text = NULL;
+ candidates[ i ].sr_ref = NULL;
+ candidates[ i ].sr_ctrls = NULL;
- if ( candidates[ i ].sr_tag != META_CANDIDATE ) {
+ if ( candidates[ i ].sr_tag != META_CANDIDATE
+ || candidates[ i ].sr_err != LDAP_SUCCESS )
+ {
continue;
}
- switch ( meta_back_search_start( op, rs, &dc, msc, i, &candidates[ i ].sr_msgid ) )
+ switch ( meta_back_search_start( op, rs, &dc, msc, i, candidates ) )
{
case 0:
break;
#endif
if ( initial_candidates == 0 ) {
- send_ldap_error( op, rs, LDAP_NO_SUCH_OBJECT, NULL );
- /* FIXME: find a way to look up the best match */
-
+ /* NOTE: here we are not sending any matchedDN;
+ * this is intended, because if the back-meta
+ * is serving this search request, but no valid
+ * candidate could be looked up, it means that
+ * there is a hole in the mapping of the targets
+ * and thus no knowledge of any remote superior
+ * is available */
+ Debug( LDAP_DEBUG_ANY, "%s meta_back_search: "
+ "base=\"%s\" scope=%d: "
+ "no candidate could be selected\n",
+ op->o_log_prefix, op->o_req_dn.bv_val,
+ op->ors_scope );
+
+ /* FIXME: we're sending the first error we encounter;
+ * maybe we should pick the worst... */
rc = LDAP_NO_SUCH_OBJECT;
+ for ( i = 0; i < mi->mi_ntargets; i++ ) {
+ if ( candidates[ i ].sr_tag == META_CANDIDATE
+ && candidates[ i ].sr_err != LDAP_SUCCESS )
+ {
+ rc = candidates[ i ].sr_err;
+ break;
+ }
+ }
+
+ send_ldap_error( op, rs, rc, NULL );
+
goto finish;
}
* but this is necessary for version matching, and for ACL processing.
*/
+ if ( op->ors_tlimit != SLAP_NO_LIMIT ) {
+ stoptime = op->o_time + op->ors_tlimit;
+ }
+
/*
* In case there are no candidates, no cycle takes place...
*
* among the candidates
*/
for ( rc = 0; ncandidates > 0; ) {
- int gotit = 0;
+ int gotit = 0, doabandon = 0;
+
+ for ( i = 0; i < mi->mi_ntargets; i++ ) {
+ metasingleconn_t *msc = &mc->mc_conns[ i ];
- for ( i = 0, msc = &lc->mc_conns[ 0 ]; !META_LAST( msc ); msc++, i++ ) {
if ( candidates[ i ].sr_msgid == -1 ) {
continue;
}
break;
}
- if ( op->ors_slimit > 0
- && rs->sr_nentries == op->ors_slimit )
- {
- rs->sr_err = LDAP_SIZELIMIT_EXCEEDED;
- rs->sr_v2ref = v2refs;
- savepriv = op->o_private;
- op->o_private = (void *)i;
- send_ldap_result( op, rs );
- op->o_private = savepriv;
- goto finish;
- }
-
/*
* FIXME: handle time limit as well?
* Note that target servers are likely
0, &tv, &res );
if ( rc == 0 ) {
- /* timeout exceeded */
-
/* FIXME: res should not need to be freed */
assert( res == NULL );
+ /* check time limit */
+ if ( op->ors_tlimit != SLAP_NO_LIMIT
+ && slap_get_time() > stoptime )
+ {
+ doabandon = 1;
+ rc = rs->sr_err = LDAP_TIMELIMIT_EXCEEDED;
+ savepriv = op->o_private;
+ op->o_private = (void *)i;
+ send_ldap_result( op, rs );
+ op->o_private = savepriv;
+ goto finish;
+ }
+
continue;
} else if ( rc == -1 ) {
really_bad:;
/* something REALLY bad happened! */
- ( void )meta_clear_unused_candidates( op, lc, -1 );
+ ( void )meta_clear_unused_candidates( op, -1 );
rs->sr_err = LDAP_OTHER;
- rs->sr_v2ref = v2refs;
savepriv = op->o_private;
op->o_private = (void *)i;
send_ldap_result( op, rs );
goto finish;
} else if ( rc == LDAP_RES_SEARCH_ENTRY ) {
+ if ( --op->ors_slimit == -1 ) {
+ ldap_msgfree( res );
+ res = NULL;
+
+ rs->sr_err = LDAP_SIZELIMIT_EXCEEDED;
+ savepriv = op->o_private;
+ op->o_private = (void *)i;
+ send_ldap_result( op, rs );
+ op->o_private = savepriv;
+ goto finish;
+ }
+
is_ok++;
e = ldap_first_entry( msc->msc_ld, res );
savepriv = op->o_private;
op->o_private = (void *)i;
- meta_send_entry( op, rs, lc, i, e );
+ meta_send_entry( op, rs, mc, i, e );
op->o_private = savepriv;
ldap_msgfree( res );
res = NULL;
+ gotit = 1;
+
+#if 0
/*
* If scope is BASE, we need to jump out
* as soon as one entry is found; if
* this should correspond to the sole
* entry that has the base DN
*/
+ /* FIXME: this defeats the purpose of
+ * doing a search with scope == base and
+ * sizelimit = 1 to determine if a
+ * candidate is actually unique */
if ( op->ors_scope == LDAP_SCOPE_BASE
&& rs->sr_nentries > 0 )
{
+ doabandon = 1;
ncandidates = 0;
sres = LDAP_SUCCESS;
break;
}
-
- gotit = 1;
+#endif
} else if ( rc == LDAP_RES_SEARCH_REFERENCE ) {
char **references = NULL;
dc.tofrom = 0;
dc.normalized = 0;
#endif /* ! ENABLE_REWRITE */
+
+ /* FIXME: merge all and return at the end */
+
for ( cnt = 0; references[ cnt ]; cnt++ )
;
}
} else if ( rc == LDAP_RES_SEARCH_RESULT ) {
- char buf[ SLAP_TEXT_BUFLEN ];
+ char buf[ SLAP_TEXT_BUFLEN ];
+ char **references = NULL;
- if ( ldap_parse_result( msc->msc_ld, res,
- &rs->sr_err,
- NULL, NULL, NULL, NULL, 1 ) )
+ if ( ldap_parse_result( msc->msc_ld,
+ res,
+ &candidates[ i ].sr_err,
+ (char **)&candidates[ i ].sr_matched,
+ NULL /* (char **)&candidates[ i ].sr_text */ ,
+ &references,
+ &candidates[ i ].sr_ctrls, 1 ) != LDAP_SUCCESS )
{
res = NULL;
+ ldap_get_option( msc->msc_ld,
+ LDAP_OPT_ERROR_NUMBER,
+ &rs->sr_err );
+ sres = slap_map_api2result( rs );
goto really_bad;
}
+
+ rs->sr_err = candidates[ i ].sr_err;
+ sres = slap_map_api2result( rs );
res = NULL;
+ /* massage matchedDN if need be */
+ if ( candidates[ i ].sr_matched != NULL ) {
+ if ( candidates[ i ].sr_matched[ 0 ] == '\0' ) {
+ ldap_memfree( (char *)candidates[ i ].sr_matched );
+ candidates[ i ].sr_matched = NULL;
+
+ } else {
+ struct berval match, mmatch;
+
+ ber_str2bv( candidates[ i ].sr_matched,
+ 0, 0, &match );
+
+ dc.ctx = "matchedDN";
+ dc.target = &mi->mi_targets[ i ];
+
+ if ( !ldap_back_dn_massage( &dc, &match, &mmatch ) ) {
+ if ( mmatch.bv_val == match.bv_val ) {
+ candidates[ i ].sr_matched = ch_strdup( mmatch.bv_val );
+
+ } else {
+ candidates[ i ].sr_matched = mmatch.bv_val;
+ }
+
+ candidate_match++;
+ }
+ ldap_memfree( match.bv_val );
+ }
+ }
+
+ /* just get rid of the error message, if any */
+ if ( candidates[ i ].sr_text && candidates[ i ].sr_text[ 0 ] == '\0' )
+ {
+ ldap_memfree( (char *)candidates[ i ].sr_text );
+ candidates[ i ].sr_text = NULL;
+ }
+
+ /* add references to array */
+ if ( references ) {
+ BerVarray sr_ref;
+ int cnt;
+
+ for ( cnt = 0; references[ cnt ]; cnt++ )
+ ;
+
+ sr_ref = ch_calloc( sizeof( struct berval ), cnt + 1 );
+
+ for ( cnt = 0; references[ cnt ]; cnt++ ) {
+ ber_str2bv( references[ cnt ], 0, 1, &sr_ref[ cnt ] );
+ }
+ BER_BVZERO( &sr_ref[ cnt ] );
+
+ ( void )ldap_back_referral_result_rewrite( &dc, sr_ref );
+
+ /* cleanup */
+ ldap_value_free( references );
+
+ if ( rs->sr_v2ref == NULL ) {
+ rs->sr_v2ref = sr_ref;
+
+ } else {
+ for ( cnt = 0; !BER_BVISNULL( &sr_ref[ cnt ] ); cnt++ ) {
+ ber_bvarray_add( &rs->sr_v2ref, &sr_ref[ cnt ] );
+ }
+ ber_memfree( sr_ref );
+ }
+ }
+
+ rs->sr_err = candidates[ i ].sr_err;
sres = slap_map_api2result( rs );
+
+ snprintf( buf, sizeof( buf ),
+ "%s meta_back_search[%ld] "
+ "match=\"%s\" err=%ld\n",
+ op->o_log_prefix, i,
+ candidates[ i ].sr_matched ? candidates[ i ].sr_matched : "",
+ (long) candidates[ i ].sr_err );
+ Debug( LDAP_DEBUG_ANY, "%s", buf, 0, 0 );
+
switch ( sres ) {
case LDAP_NO_SUCH_OBJECT:
/* is_ok is touched any time a valid
break;
case LDAP_SUCCESS:
+ case LDAP_REFERRAL:
is_ok++;
break;
- }
- if ( err != NULL ) {
- free( err );
- }
- ldap_get_option( msc->msc_ld,
- LDAP_OPT_ERROR_STRING, &err );
- if ( !BER_BVISNULL( &match ) ) {
- free( match.bv_val );
- BER_BVZERO( &match );
- }
- ldap_get_option( msc->msc_ld,
- LDAP_OPT_MATCHED_DN, &match.bv_val );
- if ( !BER_BVISNULL( &match ) ) {
- match.bv_len = strlen( match.bv_val );
+ default:
+ if ( META_BACK_ONERR_STOP( mi ) ) {
+ savepriv = op->o_private;
+ op->o_private = (void *)i;
+ send_ldap_result( op, rs );
+ op->o_private = savepriv;
+ goto finish;
+ }
+ break;
}
- snprintf( buf, sizeof( buf ),
- "%s meta_back_search[%d] "
- "match=\"%s\" err=\"%s\"\n",
- op->o_log_prefix, i,
- match.bv_val, err );
- Debug( LDAP_DEBUG_ANY, "%s", buf, 0, 0 );
-
- candidate_match++;
last = i;
rc = 0;
}
/* check for abandon */
- if ( op->o_abandon ) {
- for ( i = 0, msc = lc->mc_conns; !META_LAST( msc ); msc++, i++ ) {
- ldap_abandon_ext( msc->msc_ld, candidates[ i ].sr_msgid, NULL, NULL );
+ if ( op->o_abandon || doabandon ) {
+ for ( i = 0; i < mi->mi_ntargets; i++ ) {
+ metasingleconn_t *msc = &mc->mc_conns[ i ];
+
+ if ( candidates[ i ].sr_msgid != -1 ) {
+ ldap_abandon_ext( msc->msc_ld,
+ candidates[ i ].sr_msgid,
+ NULL, NULL );
+ candidates[ i ].sr_msgid = -1;
+ }
}
- rc = SLAPD_ABANDON;
- goto finish;
+ if ( op->o_abandon ) {
+ rc = SLAPD_ABANDON;
+ goto finish;
+ }
}
if ( gotit == 0 ) {
- tv.tv_sec = 0;
- tv.tv_usec = 100000; /* 0.1 s */
+ LDAP_BACK_TV_SET( &tv );
ldap_pvt_thread_yield();
} else {
/*
* FIXME: need a better strategy to handle errors
*/
- rc = meta_back_op_result( lc, op, rs, META_TARGET_NONE );
+ rc = meta_back_op_result( mc, op, rs, META_TARGET_NONE );
goto finish;
}
*
* FIXME: only the last one gets caught!
*/
- if ( candidate_match == initial_candidates
- && !BER_BVISNULL( &match ) && !BER_BVISEMPTY( &match ) )
- {
- dc.ctx = "matchedDN";
- dc.rwmap = &mi->mi_targets[ last ]->mt_rwmap;
+ savepriv = op->o_private;
+ op->o_private = (void *)(long)mi->mi_ntargets;
+ if ( candidate_match > 0 ) {
+ struct berval pmatched = BER_BVNULL;
- if ( ldap_back_dn_massage( &dc, &match, &mmatch ) ) {
- BER_BVZERO( &mmatch );
+ /* we use the first one */
+ for ( i = 0; i < mi->mi_ntargets; i++ ) {
+ if ( candidates[ i ].sr_tag == META_CANDIDATE
+ && candidates[ i ].sr_matched )
+ {
+ struct berval bv, pbv;
+ int rc;
+
+ ber_str2bv( candidates[ i ].sr_matched, 0, 0, &bv );
+ rc = dnPretty( NULL, &bv, &pbv, op->o_tmpmemctx );
+
+ if ( rc == LDAP_SUCCESS ) {
+
+ /* NOTE: if they all are superiors
+ * of the baseDN, the shorter is also
+ * superior of the longer... */
+ if ( pbv.bv_len > pmatched.bv_len ) {
+ if ( !BER_BVISNULL( &pmatched ) ) {
+ op->o_tmpfree( pmatched.bv_val, op->o_tmpmemctx );
+ }
+ pmatched = pbv;
+ op->o_private = (void *)i;
+
+ } else {
+ op->o_tmpfree( pbv.bv_val, op->o_tmpmemctx );
+ }
+ }
+
+ if ( candidates[ i ].sr_matched != NULL ) {
+ free( (char *)candidates[ i ].sr_matched );
+ candidates[ i ].sr_matched = NULL;
+ }
+ }
}
- }
- /*
- * In case we returned at least one entry, we return LDAP_SUCCESS
- * otherwise, the latter error code we got
- *
- * FIXME: we should handle error codes and return the more
- * important/reasonable
- */
+ if ( !BER_BVISNULL( &pmatched ) ) {
+ matched = pmatched.bv_val;
+ }
+
+ } else if ( sres == LDAP_NO_SUCH_OBJECT ) {
+ matched = op->o_bd->be_suffix[ 0 ].bv_val;
+ }
#if 0
{
}
#endif
- if ( sres == LDAP_SUCCESS && v2refs ) {
+ /*
+ * In case we returned at least one entry, we return LDAP_SUCCESS
+ * otherwise, the latter error code we got
+ *
+ * FIXME: we should handle error codes and return the more
+ * important/reasonable
+ */
+
+ if ( sres == LDAP_SUCCESS && rs->sr_v2ref ) {
sres = LDAP_REFERRAL;
}
rs->sr_err = sres;
- rs->sr_matched = mmatch.bv_val;
- rs->sr_v2ref = v2refs;
- savepriv = op->o_private;
- op->o_private = (void *)mi->mi_ntargets;
+ rs->sr_matched = matched;
+ rs->sr_ref = ( sres == LDAP_REFERRAL ? rs->sr_v2ref : NULL );
send_ldap_result( op, rs );
op->o_private = savepriv;
rs->sr_matched = NULL;
- rs->sr_v2ref = NULL;
-
+ rs->sr_ref = NULL;
finish:;
- if ( !BER_BVISNULL( &match ) ) {
- if ( !BER_BVISNULL( &mmatch ) && mmatch.bv_val != match.bv_val )
- {
- free( mmatch.bv_val );
- }
- free( match.bv_val );
+ if ( matched && matched != op->o_bd->be_suffix[ 0 ].bv_val ) {
+ op->o_tmpfree( matched, op->o_tmpmemctx );
}
-
- if ( err ) {
- free( err );
+
+ if ( rs->sr_v2ref ) {
+ ber_bvarray_free( rs->sr_v2ref );
}
-
- return rc;
+
+ for ( i = 0; i < mi->mi_ntargets; i++ ) {
+ if ( candidates[ i ].sr_tag != META_CANDIDATE ) {
+ continue;
+ }
+
+ if ( candidates[ i ].sr_matched ) {
+ free( (char *)candidates[ i ].sr_matched );
+ candidates[ i ].sr_matched = NULL;
+ }
+
+ if ( candidates[ i ].sr_text ) {
+ ldap_memfree( (char *)candidates[ i ].sr_text );
+ candidates[ i ].sr_text = NULL;
+ }
+
+ if ( candidates[ i ].sr_ref ) {
+ ber_bvarray_free( candidates[ i ].sr_ref );
+ candidates[ i ].sr_ref = NULL;
+ }
+
+ if ( candidates[ i ].sr_ctrls ) {
+ ldap_controls_free( candidates[ i ].sr_ctrls );
+ candidates[ i ].sr_ctrls = NULL;
+ }
+ }
+
+ meta_back_release_conn( op, mc );
+
+ return rs->sr_err;
}
static int
meta_send_entry(
Operation *op,
SlapReply *rs,
- struct metaconn *lc,
+ metaconn_t *mc,
int target,
LDAPMessage *e )
{
- struct metainfo *mi = ( struct metainfo * )op->o_bd->be_private;
+ metainfo_t *mi = ( metainfo_t * )op->o_bd->be_private;
struct berval a, mapped;
Entry ent = { 0 };
BerElement ber = *e->lm_ber;
Attribute *attr, **attrp;
- struct berval *bv, bdn;
+ struct berval bdn,
+ dn = BER_BVNULL;
const char *text;
dncookie dc;
+ int rc;
if ( ber_scanf( &ber, "{m{", &bdn ) == LBER_ERROR ) {
return LDAP_DECODING_ERROR;
/*
* Rewrite the dn of the result, if needed
*/
- dc.rwmap = &mi->mi_targets[ target ]->mt_rwmap;
+ dc.target = &mi->mi_targets[ target ];
dc.conn = op->o_conn;
dc.rs = rs;
dc.ctx = "searchResult";
- rs->sr_err = ldap_back_dn_massage( &dc, &bdn, &ent.e_name );
+ rs->sr_err = ldap_back_dn_massage( &dc, &bdn, &dn );
if ( rs->sr_err != LDAP_SUCCESS) {
return rs->sr_err;
}
*
* FIXME: should we log anything, or delegate to dnNormalize?
*/
- if ( dnNormalize( 0, NULL, NULL, &ent.e_name, &ent.e_nname,
- op->o_tmpmemctx ) != LDAP_SUCCESS )
- {
+ rc = dnPrettyNormal( NULL, &dn, &ent.e_name, &ent.e_nname,
+ op->o_tmpmemctx );
+ if ( dn.bv_val != bdn.bv_val ) {
+ free( dn.bv_val );
+ }
+ BER_BVZERO( &dn );
+
+ if ( rc != LDAP_SUCCESS ) {
return LDAP_INVALID_DN_SYNTAX;
}
dc.ctx = "searchAttrDN";
while ( ber_scanf( &ber, "{m", &a ) != LBER_ERROR ) {
- int last = 0;
+ int last = 0;
+ slap_syntax_validate_func *validate;
+ slap_syntax_transform_func *pretty;
- ldap_back_map( &mi->mi_targets[ target ]->mt_rwmap.rwm_at,
+ ldap_back_map( &mi->mi_targets[ target ].mt_rwmap.rwm_at,
&a, &mapped, BACKLDAP_REMAP );
if ( BER_BVISNULL( &mapped ) || mapped.bv_val[0] == '\0' ) {
continue;
attr->a_desc = NULL;
if ( slap_bv2ad( &mapped, &attr->a_desc, &text )
!= LDAP_SUCCESS) {
- if ( slap_bv2undef_ad( &mapped, &attr->a_desc, &text )
- != LDAP_SUCCESS )
+ if ( slap_bv2undef_ad( &mapped, &attr->a_desc, &text,
+ SLAP_AD_PROXIED ) != LDAP_SUCCESS )
{
char buf[ SLAP_TEXT_BUFLEN ];
}
/* no subschemaSubentry */
- if ( attr->a_desc == slap_schema.si_ad_subschemaSubentry ) {
+ if ( attr->a_desc == slap_schema.si_ad_subschemaSubentry
+ || attr->a_desc == slap_schema.si_ad_entryDN )
+ {
/*
* We eat target's subschemaSubentry because
* to resolve to the appropriate backend;
* later, the local subschemaSubentry is
* added.
+ *
+ * We also eat entryDN because the frontend
+ * will reattach it without checking if already
+ * present...
*/
( void )ber_scanf( &ber, "x" /* [W] */ );
}
if ( ber_scanf( &ber, "[W]", &attr->a_vals ) == LBER_ERROR
- || attr->a_vals == NULL ) {
+ || attr->a_vals == NULL )
+ {
attr->a_vals = (struct berval *)&slap_dummy_bv;
- } else if ( attr->a_desc == slap_schema.si_ad_objectClass
- || attr->a_desc == slap_schema.si_ad_structuralObjectClass ) {
+ } else {
+ for ( last = 0; !BER_BVISNULL( &attr->a_vals[ last ] ); ++last )
+ ;
+ }
- for ( last = 0; !BER_BVISNULL( &attr->a_vals[ last ] ); ++last );
+ validate = attr->a_desc->ad_type->sat_syntax->ssyn_validate;
+ pretty = attr->a_desc->ad_type->sat_syntax->ssyn_pretty;
+
+ if ( !validate && !pretty ) {
+ attr->a_nvals = NULL;
+ attr_free( attr );
+ goto next_attr;
+ }
+
+ if ( attr->a_desc == slap_schema.si_ad_objectClass
+ || attr->a_desc == slap_schema.si_ad_structuralObjectClass )
+ {
+ struct berval *bv;
for ( bv = attr->a_vals; !BER_BVISNULL( bv ); bv++ ) {
- ldap_back_map( &mi->mi_targets[ target ]->mt_rwmap.rwm_oc,
+ ldap_back_map( &mi->mi_targets[ target ].mt_rwmap.rwm_oc,
bv, &mapped, BACKLDAP_REMAP );
if ( BER_BVISNULL( &mapped ) || mapped.bv_val[0] == '\0') {
free( bv->bv_val );
} else if ( attr->a_desc == slap_schema.si_ad_ref ) {
ldap_back_referral_result_rewrite( &dc, attr->a_vals );
+
+ } else {
+ int i;
+
+ for ( i = 0; i < last; i++ ) {
+ struct berval pval;
+ int rc;
+
+ if ( pretty ) {
+ rc = pretty( attr->a_desc->ad_type->sat_syntax,
+ &attr->a_vals[i], &pval, NULL );
+
+ } else {
+ rc = validate( attr->a_desc->ad_type->sat_syntax,
+ &attr->a_vals[i] );
+ }
+
+ if ( rc ) {
+ LBER_FREE( attr->a_vals[i].bv_val );
+ if ( --last == i ) {
+ BER_BVZERO( &attr->a_vals[ i ] );
+ break;
+ }
+ attr->a_vals[i] = attr->a_vals[last];
+ BER_BVZERO( &attr->a_vals[last] );
+ i--;
+ continue;
+ }
+
+ if ( pretty ) {
+ LBER_FREE( attr->a_vals[i].bv_val );
+ attr->a_vals[i] = pval;
+ }
+ }
+
+ if ( last == 0 && attr->a_vals != &slap_dummy_bv ) {
+ attr_free( attr );
+ goto next_attr;
+ }
}
if ( last && attr->a_desc->ad_type->sat_equality &&
- attr->a_desc->ad_type->sat_equality->smr_normalize ) {
+ attr->a_desc->ad_type->sat_equality->smr_normalize )
+ {
int i;
- attr->a_nvals = ch_malloc((last + 1)*sizeof(struct berval));
+ attr->a_nvals = ch_malloc( ( last + 1 ) * sizeof( struct berval ) );
for ( i = 0; i<last; i++ ) {
attr->a_desc->ad_type->sat_equality->smr_normalize(
SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
*attrp = attr;
attrp = &attr->a_next;
+next_attr:;
}
rs->sr_entry = &ent;
rs->sr_attrs = op->ors_attrs;
send_search_entry( op, rs );
rs->sr_entry = NULL;
rs->sr_attrs = NULL;
- while ( ent.e_attrs ) {
- attr = ent.e_attrs;
- ent.e_attrs = attr->a_next;
- if ( attr->a_vals != &slap_dummy_bv ) {
- if ( attr->a_nvals != attr->a_vals ) {
- ber_bvarray_free( attr->a_nvals );
- }
- ber_bvarray_free( attr->a_vals );
- }
- free( attr );
- }
- if ( ent.e_dn && ent.e_dn != bdn.bv_val ) {
- free( ent.e_dn );
+ if ( !BER_BVISNULL( &ent.e_name ) ) {
+ free( ent.e_name.bv_val );
+ BER_BVZERO( &ent.e_name );
}
- if ( ent.e_ndn ) {
- free( ent.e_ndn );
+ if ( !BER_BVISNULL( &ent.e_nname ) ) {
+ free( ent.e_nname.bv_val );
+ BER_BVZERO( &ent.e_nname );
}
+ entry_clean( &ent );
return LDAP_SUCCESS;
}
projects / openldap / blobdiff