ITS#771: fix reversed logic log message

diff --git a/CHANGES b/CHANGES
index 5dd7e397efa4ea5e72ec8af02d1876e0910ee27d..519fe83fc3368bd5db82759cfd2c1ffd41671d16 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 OpenLDAP 2.0 Change Log
 
 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)
 
 OpenLDAP 2.0.4 Release

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 1bdb83d567eb917967f3663ab95027285f135e39..8470483817bf0fbe20b69d80947e508cf47de4a9 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -100,8 +100,9 @@ ldbm_back_search(
 
                cache_return_entry_r( &li->li_cache, e );
 
-               Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
-                   0, 0 );
+               Debug( LDAP_DEBUG_TRACE,
+                       "ldbm_search: entry is referral\n",
+                       0, 0, 0 );
 
                send_ldap_result( conn, op, LDAP_REFERRAL,
                    matched_dn, NULL, refs, NULL );
@@ -147,8 +148,8 @@ ldbm_back_search(
 
        if ( candidates == NULL ) {
                /* no candidates */
-               Debug( LDAP_DEBUG_TRACE, "no candidates\n", 0,
-                   0, 0 );
+               Debug( LDAP_DEBUG_TRACE, "ldbm_search: no candidates\n",
+                       0, 0, 0 );
 
                send_search_result( conn, op,
                        LDAP_SUCCESS,
@@ -186,7 +187,8 @@ ldbm_back_search(
                e = id2entry_r( be, id );
 
                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 );
 
                        goto loop_continue;
@@ -222,7 +224,8 @@ ldbm_back_search(
 
                        } else if ( dn_issuffix( e->e_ndn, realbase ) ) {
                                /* 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 );
                                goto loop_continue;
                        }
@@ -303,11 +306,13 @@ ldbm_back_search(
                                        }
                                }
                        } 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 );
                        }
                } 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 );
                }
 
@@ -366,7 +371,8 @@ search_candidates(
        static struct berval bv_ref = { sizeof("REFERRAL")-1, "REFERRAL" };
        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 );
 
        xf.f_or = filter;