/*
- * 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
LDAPMessage *res, *e;
int count, rc = 0, *msgid, sres = LDAP_NO_SUCH_OBJECT;
char *match = NULL, *err = NULL;
- char *mbase = NULL, *mmatch = NULL,
- *mapped_filter = NULL, **mapped_attrs = NULL;
+ char *mbase = NULL, *mmatch = NULL;
struct berval mfilter;
int i, last = 0, candidates = 0, op_type;
/* 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 */
/* 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 */
* Inits searches
*/
for ( i = 0, lsc = lc->conns; lsc[ 0 ] != NULL; ++i, ++lsc ) {
- char *realbase = ( char * )base->bv_val;
- int realscope = scope;
- int suffixlen;
+ char *realbase = ( char * )base->bv_val;
+ int realscope = scope;
+ ber_len_t suffixlen;
+ char *mapped_filter, **mapped_attrs;
if ( lsc[ 0 ]->candidate != META_CANDIDATE ) {
continue;
mbase = realbase;
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "[rw] searchBase: \"%s\" -> \"%s\"\n",
- base->bv_val, 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->bv_val, mbase, "" );
mfilter = *filterstr;
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "[rw] searchFilter: \"%s\" -> \"%s\"\n",
- filterstr->bv_val, mfilter.bv_val ));
+ 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",
&li->targets[ i ]->oc_map, &mfilter, 0 );
if ( mapped_filter == NULL ) {
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 && attrs) {
- AttributeName *an;
- for ( count=0, an=attrs; an->an_name.bv_val; an++, count++ );
+ for ( count=0; attrs[ count ].an_name.bv_val; count++ );
mapped_attrs = ch_malloc( ( count + 1 ) * sizeof(char *));
- for ( count=0, an=attrs; an->an_name.bv_val; an++, count++ ) {
- mapped_attrs[ count ] = an->an_name.bv_val;
+ 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);
+ mapped_filter, mapped_attrs, attrsonly );
if ( msgid[ i ] == -1 ) {
lsc[ 0 ]->candidate = META_NOT_CANDIDATE;
continue;
free( mapped_attrs );
mapped_attrs = NULL;
}
- if ( mapped_filter != mfilter.bv_val ) {
+ if ( mapped_filter != filterstr->bv_val ) {
free( mapped_filter );
mapped_filter = NULL;
}
- if ( mfilter.bv_val != filterstr->bv_val ) {
- free( mfilter.bv_val );
- mfilter.bv_val = NULL;
- mfilter.bv_len = 0;
- }
if ( mbase != realbase ) {
free( mbase );
mbase = NULL;
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 ) {
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",
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",
struct berval *bv, bdn;
const char *text;
- if ( ber_scanf( &ber, "{o", &bdn ) == LBER_ERROR ) {
+ if ( ber_scanf( &ber, "{m{", &bdn ) == LBER_ERROR ) {
return;
}
} else {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "[rw] searchResult[%d]:"
- " \"%s\" -> \"%s\"\n",
- target, bdn.bv_val, ent.e_name.bv_val ));
+ 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, bdn.bv_val, ent.e_name.bv_val );
#endif /* !NEW_LOGGING */
- free( bdn.bv_val );
- bdn.bv_val = NULL;
ent.e_name.bv_len = strlen( ent.e_name.bv_val );
}
break;
ent.e_private = 0;
attrp = &ent.e_attrs;
- while ( ber_scanf( &ber, "{{o", &a ) != LBER_ERROR ) {
+ while ( ber_scanf( &ber, "{m", &a ) != LBER_ERROR ) {
ldap_back_map( &li->targets[ target ]->at_map,
&a, &mapped, 1 );
if ( mapped.bv_val == NULL ) {
if ( attr == NULL ) {
continue;
}
+ attr->a_flags = 0;
attr->a_next = 0;
attr->a_desc = NULL;
if ( slap_bv2ad( &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_bv2undef_ad(%s): "
- "%s\n", mapped.bv_val, 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_bv2undef_ad(%s): "
}
}
- if ( ber_scanf( &ber, "[W]", &attr->a_vals ) == LBER_ERROR ) {
+ /* 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.bv_val, "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 ].bv_val; ++last );
- for ( i = 0; ( bv = &attr->a_vals[ i ] ); i++ ) {
+ 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( attr->a_vals[ i ].bv_val );
- attr->a_vals[ i ].bv_val = NULL;
+ free( bv->bv_val );
+ bv->bv_val = NULL;
if ( --last < 0 ) {
break;
}
- attr->a_vals[ i ] =
- attr->a_vals[ last ];
+ *bv = attr->a_vals[ last ];
attr->a_vals[ last ].bv_val = NULL;
- --i;
+ i--;
+
} else if ( mapped.bv_val != bv->bv_val ) {
- ch_free( 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 ) {
- bvarray_free( attr->a_vals );
+ ber_bvarray_free( attr->a_vals );
}
free( attr );
}
- if ( ent.e_dn ) {
+ if ( ent.e_dn && ent.e_dn != bdn.bv_val ) {
free( ent.e_dn );
}
if ( ent.e_ndn ) {
)
{
for ( ; from--; ) {
- if ( DN_SEPARATOR( rdn[ from ] )
- && ! DN_ESCAPE( rdn[ from ] - 1 ) ) {
+ if ( DN_SEPARATOR( rdn[ from ] ) ) {
return 0;
}
}
projects / openldap / blobdiff