struct slap_limits_set *limit = NULL;
int isroot = 0;
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "search", LDAP_LEVEL_ENTRY,"bdb_back_search\n"));
+#else
Debug( LDAP_DEBUG_TRACE, "=> bdb_back_search\n",
0, 0, 0);
+#endif
manageDSAit = get_manageDSAit( op );
ber_bvarray_free( erefs );
}
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: entry is referral\n"));
+#else
Debug( LDAP_DEBUG_TRACE, "bdb_search: entry is referral\n",
0, 0, 0 );
+#endif
send_ldap_result( conn, op, LDAP_REFERRAL,
matched_dn.bv_val,
ber_dupbv( &realbase, &e->e_nname );
/* start cursor at base entry's id
- * FIXME: hack to make "" base work */
+ * FIXME: hack to make "" base work
+ * FIXME: moddn needs to assign new ID for this to work
+ */
cursor = e->e_id == NOID ? 1 : e->e_id;
if ( e != &slap_entry_root ) {
e = NULL;
if ( candidates[0] == 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: no candidates\n"));
+#else
Debug( LDAP_DEBUG_TRACE, "bdb_search: no candidates\n",
0, 0, 0 );
+#endif
send_search_result( conn, op,
LDAP_SUCCESS,
if ( e == NULL ) {
if( !BDB_IDL_IS_RANGE(candidates) ) {
/* only complain for non-range IDLs */
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: candidate %ld not found\n", (long) id));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_search: candidate %ld not found\n",
(long) id, 0, 0 );
+#endif
}
goto loop_continue;
}
+#ifdef BDB_SUBENTRIES
if ( is_entry_subentry( e ) ) {
if( scope != LDAP_SCOPE_BASE ) {
if(!get_subentries_visibility( op )) {
/* only subentries are visible */
goto loop_continue;
}
+
} else if ( get_subentries( op ) &&
!get_subentries_visibility( op ))
{
/* only subentries are visible */
goto loop_continue;
}
+
} else if ( get_subentries_visibility( op )) {
/* only subentries are visible */
goto loop_continue;
}
+#endif
#ifdef BDB_ALIASES
if ( deref & LDAP_DEREF_SEARCHING && is_entry_alias( e ) ) {
/* need to skip alias which deref into scope */
if( scope & LDAP_SCOPE_ONELEVEL ) {
- char *pdn;
- ber_len_t plen;
+ struct berval pdn;
- if ( dnParent( e->e_nname.bv_val, &pdn ) == LDAP_SUCCESS ) {
- plen = e->e_nname.bv_len - ( pdn - e->e_nname.bv_val );
- if ( plen != realbase.bv_len || strcmp( pdn, realbase.bv_val ) ) {
- goto loop_continue;
- }
+ dnParent( &e->e_nname, &pdn ):
+ if ( ber_bvcmp( pdn, &realbase ) ) {
+ goto loop_continue;
}
} else if ( dnIsSuffix( &e->e_nname, &realbase ) ) {
/* alias is within scope */
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: \"%s\" in subtree\n", e->edn));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_search: \"%s\" in subtree\n",
e->e_dn, 0, 0 );
+#endif
goto loop_continue;
}
/* if it matches the filter and scope, send it */
rc = test_filter( be, conn, op, e, filter );
if ( rc == LDAP_COMPARE_TRUE ) {
- char *dn;
+ struct berval dn;
/* check scope */
if ( !scopeok && scope == LDAP_SCOPE_ONELEVEL ) {
- if ( be_issuffix( be, e->e_nname.bv_val ) ) {
+ if ( be_issuffix( be, &e->e_nname ) ) {
scopeok = (realbase.bv_len == 0);
} else {
- dnParent( e->e_nname.bv_val, (const char **)&dn );
- scopeok = (dn == realbase.bv_val)
- ? 1
- : (strcmp( dn, realbase.bv_val ) ? 0 : 1 );
+ dnParent( &e->e_nname, &dn );
+ scopeok = dn_match( &dn, &realbase );
}
} else if ( !scopeok && scope == LDAP_SCOPE_SUBTREE ) {
}
if (e) {
- int result = send_search_entry( be, conn, op,
- e, attrs, attrsonly, NULL);
+ int result;
+
+ if( op->o_noop ) {
+ result = 0;
+ } else {
+ result = send_search_entry( be, conn, op,
+ e, attrs, attrsonly, NULL);
+ }
switch (result) {
case 0: /* entry sent ok */
}
}
} else {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: %ld scope not okay\n", (long) id));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_search: %ld scope not okay\n",
(long) id, 0, 0 );
+#endif
}
} else {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: %ld does match filter\n", (long) id));
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_search: %ld does match filter\n",
(long) id, 0, 0 );
+#endif
}
loop_continue:
Entry *e,
ID *ids )
{
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "search", LDAP_LEVEL_ENTRY,"base_candidate: base: \"%s\" (0x%08lx)\n", e->e_dn, (long) e->e_id));
+#else
Debug(LDAP_DEBUG_ARGS, "base_candidates: base: \"%s\" (0x%08lx)\n",
e->e_dn, (long) e->e_id, 0);
+#endif
ids[0] = 1;
ids[1] = e->e_id;
ID *ids )
{
int rc;
- Filter f, scopef, sf, rf, xf;
+ Filter f, scopef, rf, xf;
ID tmp[BDB_IDL_UM_SIZE];
AttributeAssertion aa_ref;
+#ifdef BDB_SUBENTRIES
+ Filter sf;
AttributeAssertion aa_subentry;
- struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+#endif
#ifdef BDB_ALIASES
Filter af;
AttributeAssertion aa_alias;
#endif
+ struct bdb_info *bdb = (struct bdb_info *) be->be_private;
/*
* This routine takes as input a filter (user-filter)
* (|[(objectClass=referral)(objectClass=alias)](user-filter))
*/
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "search", LDAP_LEVEL_ENTRY,"search_candidates: base=\"%s\" (0x%08lx) scope=%d\n", e->e_dn, (long) e->e_id, scope));
+#else
Debug(LDAP_DEBUG_TRACE,
"search_candidates: base=\"%s\" (0x%08lx) scope=%d\n",
e->e_dn, (long) e->e_id, scope );
+#endif
xf.f_or = filter;
xf.f_choice = LDAP_FILTER_OR;
scopef.f_dn = &e->e_nname;
scopef.f_next = xf.f_or == filter ? filter : &xf ;
+#ifdef BDB_SUBENTRIES
if( get_subentries_visibility( op ) ) {
struct berval bv_subentry = { sizeof("SUBENTRY")-1, "SUBENTRY" };
sf.f_choice = LDAP_FILTER_EQUALITY;
sf.f_next = scopef.f_next;
scopef.f_next = &sf;
}
+#endif
-#ifdef BDB_FILTER_INDICES
rc = bdb_filter_candidates( be, &f, ids, tmp );
+
+ if( rc ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "search", LDAP_LEVEL_DETAIL1,"bdb_search_candidates: failed (rc=%d)\n", rc));
#else
- /* FIXME: Original code:
- BDB_IDL_ID( bdb, ids, e->e_id );
- * this is a hack to make "" base work; when bdb_filter_candidates
- * is used this should not be needed any more */
- BDB_IDL_ID( bdb, ids, (e->e_id == NOID ? 1 : e->e_id) );
- rc = 0;
+ Debug(LDAP_DEBUG_TRACE,
+ "bdb_search_candidates: failed (rc=%d)\n",
+ rc, NULL, NULL );
#endif
- Debug(LDAP_DEBUG_TRACE,
- "bdb_search_candidates: id=%ld first=%ld last=%ld\n",
- (long) ids[0],
- (long) BDB_IDL_FIRST(ids),
- (long) BDB_IDL_LAST(ids) );
+ } else {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "search", LDAP_LEVEL_DETAIL1,"bdb_search_candidates: id=%ld first=%ld last=%ld\n", (long) ids[0], (long) BDB_IDL_FIRST(ids), (long) BDB_IDL_LAST(ids)));
+#else
+ Debug(LDAP_DEBUG_TRACE,
+ "bdb_search_candidates: id=%ld first=%ld last=%ld\n",
+ (long) ids[0],
+ (long) BDB_IDL_FIRST(ids),
+ (long) BDB_IDL_LAST(ids) );
+#endif
+ }
return rc;
}
projects / openldap / blobdiff