/*
- * Copyright 1998-2001 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*
* Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
#include "../back-ldap/back-ldap.h"
#include "back-meta.h"
#include "ldap_pvt.h"
+#undef ldap_debug /* silence a warning in ldap-int.h */
+#include "ldap_log.h"
+#include "../../../libraries/libldap/ldap-int.h"
-static void
+static int
meta_send_entry(
Backend *be,
Operation *op,
struct metaconn *lc,
int i,
LDAPMessage *e,
- struct berval **attrs,
+ AttributeName *attrs,
int attrsonly
);
static int
is_one_level_rdn(
- const char *rdn,
- int len
+ const char *rdn,
+ int from
);
int
Backend *be,
Connection *conn,
Operation *op,
- const char *base,
- const char *nbase,
+ struct berval *base,
+ struct berval *nbase,
int scope,
int deref,
int slimit,
int tlimit,
Filter *filter,
- const char *filterstr,
- struct berval **attrs,
+ struct berval *filterstr,
+ AttributeName *attrs,
int attrsonly
)
{
struct metainfo *li = ( struct metainfo * )be->be_private;
struct metaconn *lc;
- struct metasingleconn **lsc;
- struct timeval tv;
+ struct metasingleconn *lsc;
+ struct timeval tv = { 0, 0 };
LDAPMessage *res, *e;
int count, rc = 0, *msgid, sres = LDAP_NO_SUCH_OBJECT;
char *match = NULL, *err = NULL;
- char *mbase = NULL, *mfilter = NULL, *mmatch = NULL,
- *mapped_filter = NULL, **mapped_attrs = NULL;
+ char *mbase = NULL, *mmatch = NULL;
+ struct berval mfilter;
+ BerVarray v2refs = NULL;
- int i, last = 0, candidates = 0, nbaselen, op_type;
+ int i, last = 0, candidates = 0, op_type;
struct slap_limits_set *limit = NULL;
int isroot = 0;
op_type = META_OP_ALLOW_MULTIPLE;
}
+ /*
+ * 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( li, conn, op, op_type, nbase, NULL );
if ( !lc || !meta_back_dobind( lc, op ) ) {
return -1;
*/
msgid = ch_calloc( sizeof( int ), li->ntargets );
if ( msgid == NULL ) {
- send_search_result( conn, op, LDAP_OPERATIONS_ERROR,
- NULL, NULL, NULL, NULL, 0 );
+ send_ldap_result( conn, op, LDAP_OTHER,
+ NULL, NULL, NULL, NULL );
return -1;
}
- nbaselen = strlen( nbase );
-
/* if not root, get appropriate limits */
if ( be_isroot( be, &op->o_ndn ) ) {
isroot = 1;
} else {
- ( void ) get_limits( be, op->o_ndn.bv_val, &limit );
+ ( void ) get_limits( be, &op->o_ndn, &limit );
}
/* if no time limit requested, rely on remote server limits */
/* if requested limit higher than hard limit, abort */
if ( !isroot && tlimit > limit->lms_t_hard ) {
/* no hard limit means use soft instead */
- if ( limit->lms_t_hard == 0 ) {
+ if ( limit->lms_t_hard == 0 && tlimit > limit->lms_t_soft ) {
tlimit = limit->lms_t_soft;
/* positive hard limit means abort */
} else if ( limit->lms_t_hard > 0 ) {
- send_search_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
- NULL, NULL, NULL, NULL, 0 );
+ send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
+ NULL, NULL, NULL, NULL );
rc = 0;
goto finish;
}
/* if requested limit higher than hard limit, abort */
if ( !isroot && slimit > limit->lms_s_hard ) {
/* no hard limit means use soft instead */
- if ( limit->lms_s_hard == 0 ) {
+ if ( limit->lms_s_hard == 0 && slimit > limit->lms_s_soft ) {
slimit = limit->lms_s_soft;
/* positive hard limit means abort */
} else if ( limit->lms_s_hard > 0 ) {
- send_search_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
- NULL, NULL, NULL, NULL, 0 );
+ send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
+ NULL, NULL, NULL, NULL );
rc = 0;
goto finish;
}
/*
* Inits searches
*/
- for ( i = 0, lsc = lc->conns; lsc[ 0 ] != NULL; ++i, ++lsc ) {
- char *realbase = ( char * )base;
- int realscope = scope;
- int suffixlen;
+ for ( i = 0, lsc = lc->conns; !META_LAST(lsc); ++i, ++lsc ) {
+ char *realbase = ( char * )base->bv_val;
+ int realscope = scope;
+ ber_len_t suffixlen;
+ char *mapped_filter, **mapped_attrs;
- if ( lsc[ 0 ]->candidate != META_CANDIDATE ) {
+ if ( lsc->candidate != META_CANDIDATE ) {
continue;
}
+ /* should we check return values? */
if ( deref != -1 ) {
- ldap_set_option( lsc[ 0 ]->ld, LDAP_OPT_DEREF,
+ ldap_set_option( lsc->ld, LDAP_OPT_DEREF,
( void * )&deref);
}
if ( tlimit != -1 ) {
- ldap_set_option( lsc[ 0 ]->ld, LDAP_OPT_TIMELIMIT,
+ ldap_set_option( lsc->ld, LDAP_OPT_TIMELIMIT,
( void * )&tlimit);
}
if ( slimit != -1 ) {
- ldap_set_option( lsc[ 0 ]->ld, LDAP_OPT_SIZELIMIT,
+ ldap_set_option( lsc->ld, LDAP_OPT_SIZELIMIT,
( void * )&slimit);
}
/*
* modifies the base according to the scope, if required
*/
- suffixlen = strlen( li->targets[ i ]->suffix );
- if ( suffixlen > nbaselen ) {
+ suffixlen = li->targets[ i ]->suffix.bv_len;
+ if ( suffixlen > nbase->bv_len ) {
switch ( scope ) {
case LDAP_SCOPE_SUBTREE:
/*
* illegal bases may be turned into
* the suffix of the target.
*/
- if ( dn_issuffix( li->targets[ i ]->suffix,
+ if ( dnIsSuffix( &li->targets[ i ]->suffix,
nbase ) ) {
- realbase = li->targets[ i ]->suffix;
+ realbase = li->targets[ i ]->suffix.bv_val;
} else {
/*
* this target is no longer candidate
*/
- lsc[ 0 ]->candidate = META_NOT_CANDIDATE;
+ lsc->candidate = META_NOT_CANDIDATE;
continue;
}
break;
case LDAP_SCOPE_ONELEVEL:
- if ( is_one_level_rdn( li->targets[ i ]->suffix,
- suffixlen-nbaselen-1)
- && dn_issuffix( li->targets[ i ]->suffix, nbase ) ) {
+ if ( is_one_level_rdn( li->targets[ i ]->suffix.bv_val,
+ suffixlen - nbase->bv_len - 1 )
+ && dnIsSuffix( &li->targets[ i ]->suffix, nbase ) ) {
/*
* if there is exactly one level,
* make the target suffix the new
* base, and make scope "base"
*/
- realbase = li->targets[ i ]->suffix;
+ realbase = li->targets[ i ]->suffix.bv_val;
realscope = LDAP_SCOPE_BASE;
break;
} /* else continue with the next case */
/*
* this target is no longer candidate
*/
- lsc[ 0 ]->candidate = META_NOT_CANDIDATE;
+ lsc->candidate = META_NOT_CANDIDATE;
continue;
}
mbase = realbase;
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "[rw] searchBase: \"%s\" -> \"%s\"\n",
- base, mbase ));
+ LDAP_LOG( BACK_META, DETAIL1,
+ "[rw] searchBase: \"%s\" -> \"%s\"\n", base->bv_val, mbase, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS, "rw> searchBase: \"%s\" -> \"%s\"\n%s",
- base, mbase, "" );
+ base->bv_val, mbase, "" );
#endif /* !NEW_LOGGING */
break;
case REWRITE_REGEXEC_UNWILLING:
send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
- NULL, "Unwilling to perform",
- NULL, NULL );
+ NULL, NULL, NULL, NULL );
rc = -1;
goto finish;
case REWRITE_REGEXEC_ERR:
- send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
- NULL, "Operations error",
- NULL, NULL );
+ send_ldap_result( conn, op, LDAP_OTHER,
+ NULL, NULL, NULL, NULL );
rc = -1;
goto finish;
}
*/
switch ( rewrite_session( li->targets[ i ]->rwinfo,
"searchFilter",
- filterstr, conn, &mfilter ) ) {
+ filterstr->bv_val, conn, &mfilter.bv_val ) ) {
case REWRITE_REGEXEC_OK:
- if ( mfilter == NULL || mfilter[ 0 ] == '\0') {
- if ( mfilter != NULL ) {
- free( mfilter );
+ if ( mfilter.bv_val != NULL && mfilter.bv_val[ 0 ] != '\0') {
+ mfilter.bv_len = strlen( mfilter.bv_val );
+ } else {
+ if ( mfilter.bv_val != NULL ) {
+ free( mfilter.bv_val );
}
- mfilter = ( char * )filterstr;
+ mfilter = *filterstr;
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "[rw] searchFilter: \"%s\" -> \"%s\"\n",
- filterstr, mfilter ));
+ LDAP_LOG( BACK_META, DETAIL1,
+ "[rw] searchFilter: \"%s\" -> \"%s\"\n",
+ filterstr->bv_val, mfilter.bv_val, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS,
"rw> searchFilter: \"%s\" -> \"%s\"\n%s",
- filterstr, mfilter, "" );
+ filterstr->bv_val, mfilter.bv_val, "" );
#endif /* !NEW_LOGGING */
break;
goto finish;
case REWRITE_REGEXEC_ERR:
- send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+ send_ldap_result( conn, op, LDAP_OTHER,
NULL, NULL, NULL, NULL );
rc = -1;
goto finish;
* Maps attributes in filter
*/
mapped_filter = ldap_back_map_filter( &li->targets[ i ]->at_map,
- &li->targets[ i ]->oc_map,
- ( char * )mfilter, 0 );
+ &li->targets[ i ]->oc_map, &mfilter, 0 );
if ( mapped_filter == NULL ) {
- mapped_filter = ( char * )mfilter;
+ mapped_filter = ( char * )mfilter.bv_val;
+ } else {
+ if ( mfilter.bv_val != filterstr->bv_val ) {
+ free( mfilter.bv_val );
+ }
}
+ mfilter.bv_val = NULL;
+ mfilter.bv_len = 0;
/*
* Maps required attributes
*/
mapped_attrs = ldap_back_map_attrs( &li->targets[ i ]->at_map,
attrs, 0 );
- if ( mapped_attrs == NULL ) {
- mapped_attrs = attrs;
+ if ( mapped_attrs == NULL && attrs) {
+ for ( count=0; attrs[ count ].an_name.bv_val; count++ );
+ mapped_attrs = ch_malloc( ( count + 1 ) * sizeof(char *));
+ for ( count=0; attrs[ count ].an_name.bv_val; count++ ) {
+ mapped_attrs[ count ] = attrs[ count ].an_name.bv_val;
+ }
+ mapped_attrs[ count ] = NULL;
}
/*
* Starts the search
*/
- msgid[ i ] = ldap_search( lsc[ 0 ]->ld, mbase, realscope,
- mapped_filter, mapped_attrs, attrsonly);
+ msgid[ i ] = ldap_search( lsc->ld, mbase, realscope,
+ mapped_filter, mapped_attrs, attrsonly );
if ( msgid[ i ] == -1 ) {
- lsc[ 0 ]->candidate = META_NOT_CANDIDATE;
+ lsc->candidate = META_NOT_CANDIDATE;
continue;
}
- if ( mapped_attrs != attrs ) {
- charray_free( mapped_attrs );
+ if ( mapped_attrs ) {
+ free( mapped_attrs );
mapped_attrs = NULL;
}
- if ( mapped_filter != mfilter ) {
+ if ( mapped_filter != filterstr->bv_val ) {
free( mapped_filter );
mapped_filter = NULL;
}
- if ( mfilter != filterstr ) {
- free( mfilter );
- mfilter = NULL;
- }
if ( mbase != realbase ) {
free( mbase );
mbase = NULL;
/*
* In case there are no candidates, no cycle takes place...
+ *
+ * FIXME: we might use a queue, to balance the load
+ * among the candidates
*/
for ( count = 0, rc = 0; candidates > 0; ) {
int ab, gotit = 0;
/* check for abandon */
- ldap_pvt_thread_mutex_lock( &op->o_abandonmutex );
ab = op->o_abandon;
- ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
- for ( i = 0, lsc = lc->conns; lsc[ 0 ] != NULL; lsc++, i++ ) {
- if ( lsc[ 0 ]->candidate != META_CANDIDATE ) {
+ for ( i = 0, lsc = lc->conns; !META_LAST(lsc); lsc++, i++ ) {
+ if ( lsc->candidate != META_CANDIDATE ) {
continue;
}
if ( ab ) {
- ldap_abandon( lsc[ 0 ]->ld, msgid[ i ] );
+ ldap_abandon( lsc->ld, msgid[ i ] );
rc = 0;
break;
}
if ( slimit > 0 && count == slimit ) {
send_search_result( conn, op,
LDAP_SIZELIMIT_EXCEEDED,
- NULL, NULL, NULL, NULL, count );
+ NULL, NULL, v2refs, NULL,
+ count );
goto finish;
}
- rc = ldap_result( lsc[ 0 ]->ld, msgid[ i ],
+ /*
+ * FIXME: handle time limit as well?
+ * Note that target servers are likely
+ * to handle it, so at some time we'll
+ * get a LDAP_TIMELIMIT_EXCEEDED from
+ * one of them ...
+ */
+ rc = ldap_result( lsc->ld, msgid[ i ],
0, &tv, &res );
if ( rc == 0 ) {
continue;
+
} else if ( rc == -1 ) {
/* something REALLY bad happened! */
( void )meta_clear_unused_candidates( li,
lc, -1, 0 );
- send_search_result( conn, op,
- LDAP_OPERATIONS_ERROR,
- "", "", NULL, NULL, count );
+ send_search_result( conn, op, LDAP_OTHER,
+ NULL, NULL, v2refs, NULL,
+ count );
/* anything else needs be done? */
goto finish;
+
} else if ( rc == LDAP_RES_SEARCH_ENTRY ) {
- e = ldap_first_entry( lsc[ 0 ]->ld,res );
- meta_send_entry(be, op, lc, i, e, attrs,
- attrsonly);
- count++;
+ e = ldap_first_entry( lsc->ld, res );
+ if ( meta_send_entry( be, op, lc, i, e, attrs,
+ attrsonly ) == LDAP_SUCCESS ) {
+ count++;
+ }
ldap_msgfree( res );
gotit = 1;
+
+ } else if ( rc == LDAP_RES_SEARCH_REFERENCE ) {
+ char **references = NULL;
+ LDAPControl **ctrls = NULL;
+ BerVarray refs;
+ int cnt;
+
+ /*
+ * FIXME: should we collect references
+ * and send them alltogether at the end?
+ */
+
+ rc = ldap_parse_reference( lsc->ld, res,
+ &references, &ctrls, 1 );
+
+ if ( rc != LDAP_SUCCESS ) {
+ continue;
+ }
+
+ if ( references == NULL ) {
+ continue;
+ }
+
+ for ( cnt = 0; references[ cnt ]; cnt++ )
+ /* NO OP */ ;
+
+ refs = ch_calloc( cnt + 1, sizeof( struct berval ) );
+
+ for ( cnt = 0; references[ cnt ]; cnt++ ) {
+ refs[ cnt ].bv_val = references[ cnt ];
+ refs[ cnt ].bv_len = strlen( references[ cnt ] );
+ }
+
+ /* ignore return value by now */
+ ( void )send_search_reference( be, conn, op,
+ NULL, refs, ctrls, &v2refs );
+
+ /* cleanup */
+ if ( references ) {
+ ldap_value_free( references );
+ ch_free( refs );
+ }
+
+ if ( ctrls ) {
+ ldap_controls_free( ctrls );
+ }
+
} else {
- sres = ldap_result2error( lsc[ 0 ]->ld,
+ sres = ldap_result2error( lsc->ld,
res, 1 );
sres = ldap_back_map_result( sres );
if ( err != NULL ) {
free( err );
}
- ldap_get_option( lsc[ 0 ]->ld,
+ ldap_get_option( lsc->ld,
LDAP_OPT_ERROR_STRING, &err );
if ( match != NULL ) {
free( match );
}
- ldap_get_option( lsc[ 0 ]->ld,
+ ldap_get_option( lsc->ld,
LDAP_OPT_MATCHED_DN, &match );
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "meta_back_search [%d]"
- " match=\"%s\" err=\"%s\"\n",
- i, match, err ));
+ LDAP_LOG( BACK_META, ERR,
+ "meta_back_search [%d] "
+ "match=\"%s\" err=\"%s\"\n",
+ i, match, err );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ANY,
- "=>meta_back_search [%d] match=\"%s\" err=\"%s\"\n",
+ "=>meta_back_search [%d] "
+ "match=\"%s\" err=\"%s\"\n",
i, match, err );
#endif /* !NEW_LOGGING */
* When no candidates are left,
* the outer cycle finishes
*/
- lsc[ 0 ]->candidate = META_NOT_CANDIDATE;
+ lsc->candidate = META_NOT_CANDIDATE;
--candidates;
}
}
mmatch = ( char * )match;
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "[rw] matchedDn: \"%s\" -> \"%s\"\n",
- match, mmatch ));
+ LDAP_LOG( BACK_META, DETAIL1,
+ "[rw] matchedDn: \"%s\" -> \"%s\"\n", match, mmatch, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS, "rw> matchedDn:"
" \"%s\" -> \"%s\"\n%s",
goto finish;
case REWRITE_REGEXEC_ERR:
- send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+ send_ldap_result( conn, op, LDAP_OTHER,
NULL, NULL, NULL, NULL );
rc = -1;
goto finish;
}
}
- send_search_result( conn, op, sres,
- mmatch, err, NULL, NULL, count );
+ /*
+ * 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 && v2refs ) {
+ sres = LDAP_REFERRAL;
+ }
+ send_search_result( conn, op, sres, mmatch, err, v2refs, NULL, count );
finish:;
if ( match ) {
}
if ( msgid ) {
- free( msgid );
+ ch_free( msgid );
}
-
+
return rc;
}
-static void
+static int
meta_send_entry(
- Backend *be,
- Operation *op,
+ Backend *be,
+ Operation *op,
struct metaconn *lc,
- int target,
- LDAPMessage *e,
- struct berval **attrs,
- int attrsonly
+ int target,
+ LDAPMessage *e,
+ AttributeName *attrs,
+ int attrsonly
)
{
- struct metainfo *li = ( struct metainfo * )be->be_private;
- char *a, *mapped;
- Entry ent;
- BerElement *ber = NULL;
- Attribute *attr, **attrp;
- struct berval *dummy = NULL;
- struct berval *bv;
- const char *text;
- char *dn;
-
- struct metasingleconn *lsc = lc->conns[ target ];
-
- dn = ldap_get_dn( lsc->ld, e );
- if ( dn == NULL ) {
- return;
+ struct metainfo *li = ( struct metainfo * )be->be_private;
+ struct berval a, mapped;
+ Entry ent;
+ BerElement ber = *e->lm_ber;
+ Attribute *attr, **attrp;
+ struct berval dummy = { 0, NULL };
+ struct berval *bv, bdn;
+ const char *text;
+
+ if ( ber_scanf( &ber, "{m{", &bdn ) == LBER_ERROR ) {
+ return LDAP_DECODING_ERROR;
}
/*
* Rewrite the dn of the result, if needed
*/
switch ( rewrite_session( li->targets[ target ]->rwinfo,
- "searchResult", dn, lc->conn, &ent.e_dn ) ) {
+ "searchResult", bdn.bv_val, lc->conn, &ent.e_name.bv_val ) ) {
case REWRITE_REGEXEC_OK:
- if ( ent.e_dn == NULL ) {
- ent.e_dn = dn;
+ if ( ent.e_name.bv_val == NULL ) {
+ ent.e_name = bdn;
+
} else {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "[rw] searchResult[%d]:"
- " \"%s\" -> \"%s\"\n",
- target, dn, ent.e_dn ));
+ LDAP_LOG( BACK_META, DETAIL1,
+ "[rw] searchResult[%d]: \"%s\" -> \"%s\"\n",
+ target, bdn.bv_val, ent.e_name.bv_val );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS, "rw> searchResult[%d]: \"%s\""
- " -> \"%s\"\n", target, dn, ent.e_dn );
+ " -> \"%s\"\n", target, bdn.bv_val, ent.e_name.bv_val );
#endif /* !NEW_LOGGING */
- free( dn );
- dn = NULL;
+ ent.e_name.bv_len = strlen( ent.e_name.bv_val );
}
break;
case REWRITE_REGEXEC_ERR:
case REWRITE_REGEXEC_UNWILLING:
- free( dn );
- return;
+ return LDAP_OTHER;
}
- ent.e_ndn = ch_strdup( ent.e_dn );
- ( void )dn_normalize( ent.e_ndn );
+ /*
+ * Note: this may fail if the target host(s) schema differs
+ * from the one known to the meta, and a DN with unknown
+ * attributes is returned.
+ *
+ * FIXME: should we log anything, or delegate to dnNormalize2?
+ */
+ if ( dnNormalize2( NULL, &ent.e_name, &ent.e_nname ) != LDAP_SUCCESS ) {
+ return LDAP_INVALID_DN_SYNTAX;
+ }
/*
* cache dn
*/
if ( li->cache.ttl != META_DNCACHE_DISABLED ) {
( void )meta_dncache_update_entry( &li->cache,
- ch_strdup( ent.e_ndn ),
+ &ent.e_nname,
target );
}
ent.e_private = 0;
attrp = &ent.e_attrs;
- for ( a = ldap_first_attribute( lsc->ld, e, &ber );
- a != NULL;
- a = ldap_next_attribute( lsc->ld, e, ber ) )
- {
- mapped = ldap_back_map( &li->targets[ target ]->at_map, a, 1 );
- if ( mapped == NULL ) {
+ while ( ber_scanf( &ber, "{m", &a ) != LBER_ERROR ) {
+ ldap_back_map( &li->targets[ target ]->at_map,
+ &a, &mapped, 1 );
+ if ( mapped.bv_val == NULL ) {
continue;
}
attr = ( Attribute * )ch_malloc( sizeof( Attribute ) );
if ( attr == NULL ) {
continue;
}
+ attr->a_flags = 0;
attr->a_next = 0;
attr->a_desc = NULL;
- if ( slap_str2ad( mapped, &attr->a_desc, &text )
+ if ( slap_bv2ad( &mapped, &attr->a_desc, &text )
!= LDAP_SUCCESS) {
- if (slap_str2undef_ad(mapped, &attr->a_desc, &text)
+ if ( slap_bv2undef_ad( &mapped, &attr->a_desc, &text )
!= LDAP_SUCCESS) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "slap_str2undef_ad(%s): "
- "%s\n", mapped, text ));
+ LDAP_LOG( BACK_META, DETAIL1,
+ "slap_bv2undef_ad(%s): %s\n", mapped.bv_val, text, 0 );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ANY,
- "slap_str2undef_ad(%s): "
- "%s\n%s", mapped, text, "" );
+ "slap_bv2undef_ad(%s): "
+ "%s\n%s", mapped.bv_val, text, "" );
#endif /* !NEW_LOGGING */
- ch_free(attr);
+ ch_free( attr );
continue;
}
}
- attr->a_vals = ldap_get_values_len( lsc->ld, e, a );
- if ( !attr->a_vals ) {
+
+ /* no subschemaSubentry */
+ if ( attr->a_desc == slap_schema.si_ad_subschemaSubentry ) {
+ ch_free(attr);
+ continue;
+ }
+
+ if ( ber_scanf( &ber, "[W]", &attr->a_vals ) == LBER_ERROR
+ || attr->a_vals == NULL ) {
attr->a_vals = &dummy;
- } else if ( strcasecmp( mapped, "objectClass" ) == 0 ) {
+
+ } else if ( attr->a_desc == slap_schema.si_ad_objectClass
+ || attr->a_desc == slap_schema.si_ad_structuralObjectClass ) {
int i, last;
- for ( last = 0; attr->a_vals[ last ]; ++last ) ;
- for ( i = 0; ( bv = attr->a_vals[ i ] ); i++ ) {
- mapped = ldap_back_map(
- &li->targets[ target]->oc_map,
- bv->bv_val, 1 );
- if ( mapped == NULL ) {
- ber_bvfree( attr->a_vals[ i ] );
- attr->a_vals[ i ] = NULL;
+ for ( last = 0; attr->a_vals[ last ].bv_val; ++last );
+ for ( i = 0, bv = attr->a_vals; bv->bv_val; bv++, i++ ) {
+ ldap_back_map( &li->targets[ target]->oc_map,
+ bv, &mapped, 1 );
+ if ( mapped.bv_val == NULL ) {
+ free( bv->bv_val );
+ bv->bv_val = NULL;
if ( --last < 0 ) {
break;
}
- attr->a_vals[ i ] =
- attr->a_vals[ last ];
- attr->a_vals[ last ] = NULL;
- --i;
- } else if ( mapped != bv->bv_val ) {
- ch_free( bv->bv_val );
- bv->bv_val = ch_strdup( mapped );
- bv->bv_len = strlen( mapped );
+ *bv = attr->a_vals[ last ];
+ attr->a_vals[ last ].bv_val = NULL;
+ i--;
+
+ } else if ( mapped.bv_val != bv->bv_val ) {
+ free( bv->bv_val );
+ ber_dupbv( bv, &mapped );
}
}
/*
} else if ( strcmp( attr->a_desc->ad_type->sat_syntax->ssyn_oid,
SLAPD_DN_SYNTAX ) == 0 ) {
int i;
- for ( i = 0; ( bv = attr->a_vals[ i ] ); i++ ) {
+ for ( i = 0, bv = attr->a_vals; bv->bv_val; bv++, i++ ) {
char *newval;
switch ( rewrite_session( li->targets[ target ]->rwinfo,
break;
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend",
- LDAP_LEVEL_DETAIL1,
- "[rw] searchResult on"
- " attr=%s:"
- " \"%s\" -> \"%s\"\n",
- attr->a_desc->ad_type->sat_cname.bv_val,
- bv->bv_val, newval ));
+ LDAP_LOG( BACK_META, DETAIL1,
+ "[rw] searchResult on attr=%s: \"%s\" -> \"%s\"\n",
+ attr->a_desc->ad_type->sat_cname.bv_val,
+ bv->bv_val, newval );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS,
"rw> searchResult on attr=%s:"
attr->a_desc->ad_type->sat_cname.bv_val,
bv->bv_val, newval );
#endif /* !NEW_LOGGING */
-
free( bv->bv_val );
bv->bv_val = newval;
bv->bv_len = strlen( newval );
attr = ent.e_attrs;
ent.e_attrs = attr->a_next;
if ( attr->a_vals != &dummy ) {
- ber_bvecfree(attr->a_vals);
+ ber_bvarray_free( attr->a_vals );
}
free( attr );
}
- if ( ber ) {
- ber_free( ber, 0 );
- }
- if ( ent.e_dn ) {
+ if ( ent.e_dn && ent.e_dn != bdn.bv_val ) {
free( ent.e_dn );
}
if ( ent.e_ndn ) {
free( ent.e_ndn );
}
+
+ return LDAP_SUCCESS;
}
static int
is_one_level_rdn(
- const char *rdn,
- int len
+ const char *rdn,
+ int from
)
{
- for ( ; len--; ) {
- if ( LDAP_DNSEPARATOR( rdn[ len ] ) ) {
+ for ( ; from--; ) {
+ if ( DN_SEPARATOR( rdn[ from ] ) ) {
return 0;
}
}
projects / openldap / blobdiff