dsdb: Add tracing to dsdb_search() similar to gendb_search_v()

The aim of this tracing is to make it simple to follow the
requests made from the RPC server and similar to LDB now that
gendb_search_v() is no longer the dominant interface.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index f055181e1e77f29d8a2b273c70156ca9d16bd42b..4a54a2b1433279de3f88f86a17ba2705be86d554 100644 (file)
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -5445,17 +5445,39 @@ int dsdb_search(struct ldb_context *ldb,
        }
 
        if (ret != LDB_SUCCESS) {
+               DBG_INFO("%s flags=0x%08x %s %s -> %s (%s)\n",
+                        dsdb_search_scope_as_string(scope),
+                        dsdb_flags,
+                        basedn?ldb_dn_get_extended_linearized(tmp_ctx,
+                                                              basedn,
+                                                              1):"NULL",
+                        expression?expression:"NULL",
+                        ldb_errstring(ldb), ldb_strerror(ret));
                talloc_free(tmp_ctx);
                return ret;
        }
 
        if (dsdb_flags & DSDB_SEARCH_ONE_ONLY) {
                if (res->count == 0) {
+                       DBG_INFO("%s SEARCH_ONE_ONLY flags=0x%08x %s %s -> %u results\n",
+                                dsdb_search_scope_as_string(scope),
+                                dsdb_flags,
+                                basedn?ldb_dn_get_extended_linearized(tmp_ctx,
+                                                                      basedn,
+                                                                      1):"NULL",
+                                expression?expression:"NULL", res->count);
                        talloc_free(tmp_ctx);
                        ldb_reset_err_string(ldb);
                        return ldb_error(ldb, LDB_ERR_NO_SUCH_OBJECT, __func__);
                }
                if (res->count != 1) {
+                       DBG_INFO("%s SEARCH_ONE_ONLY flags=0x%08x %s %s -> %u (expected 1) results\n",
+                                dsdb_search_scope_as_string(scope),
+                                dsdb_flags,
+                                basedn?ldb_dn_get_extended_linearized(tmp_ctx,
+                                                                      basedn,
+                                                                      1):"NULL",
+                                expression?expression:"NULL", res->count);
                        talloc_free(tmp_ctx);
                        ldb_reset_err_string(ldb);
                        return LDB_ERR_CONSTRAINT_VIOLATION;
@@ -5463,8 +5485,16 @@ int dsdb_search(struct ldb_context *ldb,
        }
 
        *_result = talloc_steal(mem_ctx, res);
-       talloc_free(tmp_ctx);
 
+       DBG_DEBUG("%s flags=0x%08x %s %s -> %d\n",
+                 dsdb_search_scope_as_string(scope),
+                 dsdb_flags,
+                 basedn?ldb_dn_get_extended_linearized(tmp_ctx,
+                                                       basedn,
+                                                       1):"NULL",
+                 expression?expression:"NULL",
+                 res->count);
+       talloc_free(tmp_ctx);
        return LDB_SUCCESS;
 }