mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#771: fix reversed logic log message

Browse Source
This commit is contained in:
Kurt Zeilenga 2000-09-28 19:44:03 +00:00
parent 26f6f5d43b
commit 06a4be7ea0
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,6 +1,8 @@
OpenLDAP 2.0 Change Log OpenLDAP 2.0 Change Log
OpenLDAP 2.0.X Engineering OpenLDAP 2.0.X Engineering
Fixed slapd/ldbm/search confusing log message (ITS#771)
Fixed slapd/sasl no cred bug
Fixed slurpd TLS initialization bug (ITS#768) Fixed slurpd TLS initialization bug (ITS#768)
OpenLDAP 2.0.4 Release OpenLDAP 2.0.4 Release

24
servers/slapd/back-ldbm/search.c
View File

@ -100,8 +100,9 @@ ldbm_back_search(
cache_return_entry_r( &li->li_cache, e ); cache_return_entry_r( &li->li_cache, e );
Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0, Debug( LDAP_DEBUG_TRACE,
0, 0 ); "ldbm_search: entry is referral\n",
0, 0, 0 );
send_ldap_result( conn, op, LDAP_REFERRAL, send_ldap_result( conn, op, LDAP_REFERRAL,
matched_dn, NULL, refs, NULL ); matched_dn, NULL, refs, NULL );
@ -147,8 +148,8 @@ ldbm_back_search(
if ( candidates == NULL ) { if ( candidates == NULL ) {
/* no candidates */ /* no candidates */
Debug( LDAP_DEBUG_TRACE, "no candidates\n", 0, Debug( LDAP_DEBUG_TRACE, "ldbm_search: no candidates\n",
0, 0 ); 0, 0, 0 );
send_search_result( conn, op, send_search_result( conn, op,
LDAP_SUCCESS, LDAP_SUCCESS,
@ -186,7 +187,8 @@ ldbm_back_search(
e = id2entry_r( be, id ); e = id2entry_r( be, id );
if ( e == NULL ) { if ( e == NULL ) {
Debug( LDAP_DEBUG_ARGS, "search: candidate %ld not found\n", Debug( LDAP_DEBUG_TRACE,
"ldbm_search: candidate %ld not found\n",
id, 0, 0 ); id, 0, 0 );
goto loop_continue; goto loop_continue;
@ -222,7 +224,8 @@ ldbm_back_search(
} else if ( dn_issuffix( e->e_ndn, realbase ) ) { } else if ( dn_issuffix( e->e_ndn, realbase ) ) {
/* alias is within scope */ /* alias is within scope */
Debug( LDAP_DEBUG_ARGS, "search: \"%s\" in subtree\n", Debug( LDAP_DEBUG_TRACE,
"ldbm_search: \"%s\" in subtree\n",
e->e_dn, 0, 0 ); e->e_dn, 0, 0 );
goto loop_continue; goto loop_continue;
} }
@ -303,11 +306,13 @@ ldbm_back_search(
} }
} }
} else { } else {
Debug( LDAP_DEBUG_TRACE, "candidate %ld scope not okay\n", Debug( LDAP_DEBUG_TRACE,
"ldbm_search: candidate %ld scope not okay\n",
id, 0, 0 ); id, 0, 0 );
} }
} else { } else {
Debug( LDAP_DEBUG_TRACE, "candidate %ld does match filter\n", Debug( LDAP_DEBUG_TRACE,
"ldbm_search: candidate %ld does not match filter\n",
id, 0, 0 ); id, 0, 0 );
} }
@ -366,7 +371,8 @@ search_candidates(
static struct berval bv_ref = { sizeof("REFERRAL")-1, "REFERRAL" }; static struct berval bv_ref = { sizeof("REFERRAL")-1, "REFERRAL" };
static struct berval bv_alias = { sizeof("ALIAS")-1, "ALIAS" }; static struct berval bv_alias = { sizeof("ALIAS")-1, "ALIAS" };
Debug(LDAP_DEBUG_TRACE, "search_candidates: base=\"%s\" s=%d d=%d\n", Debug(LDAP_DEBUG_TRACE,
"search_candidates: base=\"%s\" s=%d d=%d\n",
e->e_ndn, scope, deref ); e->e_ndn, scope, deref );
xf.f_or = filter; xf.f_or = filter;