Revert "cldap benchmarks hacks ..."

This reverts commit b285192e79a2784c59514f738214814bcfa08844.

diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c
index 49ddce59efff99d2be959ea114c7dbf806ff0597..33c0adc3b18b6d34a2f8abfe968d91124282cefb 100644 (file)
--- a/source4/cldap_server/netlogon.c
+++ b/source4/cldap_server/netlogon.c
@@ -421,10 +421,6 @@ void cldapd_netlogon_request(struct cldap_socket *cldap,
        struct netlogon_samlogon_response netlogon;
        NTSTATUS status = NT_STATUS_INVALID_PARAMETER;
 
-       DEBUG(2,("cldap netlogon query failed domain=%s host=%s version=%d - %s\n",
-                domain, host, version, nt_errstr(status)));
-       cldap_empty_reply(cldap, message_id, src);
-return;
        if (tree->operation != LDB_OP_AND) goto failed;
 
        /* extract the query elements */

diff --git a/source4/cldap_server/rootdse.c b/source4/cldap_server/rootdse.c
index b09c51c494d813bf3bb21b33679df9bad1460ce0..7e867deff29f2d244c6d82558d55dc4eb8310b16 100644 (file)
--- a/source4/cldap_server/rootdse.c
+++ b/source4/cldap_server/rootdse.c
@@ -164,7 +164,7 @@ void cldapd_rootdse_request(struct cldap_socket *cldap,
        reply.response          = NULL;
        reply.result            = &result;
 
-//     cldapd_rootdse_fill(cldapd, tmp_ctx, search, &reply.response, reply.result);
+       cldapd_rootdse_fill(cldapd, tmp_ctx, search, &reply.response, reply.result);
 
        status = cldap_reply_send(cldap, &reply);
        if (!NT_STATUS_IS_OK(status)) {

diff --git a/source4/torture/ldap/cldapbench.c b/source4/torture/ldap/cldapbench.c
index a46fee03d904da48db8cea140b9204cee7af6f8f..a422732b039100dc62975f6badd4b3b29eb10abb 100644 (file)
--- a/source4/torture/ldap/cldapbench.c
+++ b/source4/torture/ldap/cldapbench.c
@@ -44,11 +44,7 @@ static void request_netlogon_handler(struct tevent_req *req)
        talloc_free(req);
        if (NT_STATUS_IS_OK(status)) {
                state->pass_count++;
-       } else if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
-               state->pass_count++;
        } else {
-               printf("error: %s\n", nt_errstr(status));
-               exit(1);
                state->fail_count++;
        }
        talloc_free(tmp_ctx);
@@ -124,11 +120,7 @@ static void request_rootdse_handler(struct tevent_req *req)
        talloc_free(req);
        if (NT_STATUS_IS_OK(status)) {
                state->pass_count++;
-       } else if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
-               state->pass_count++;
        } else {
-               printf("error: %s\n", nt_errstr(status));
-               exit(1);
                state->fail_count++;
        }
        talloc_free(tmp_ctx);
@@ -215,7 +207,7 @@ bool torture_bench_cldap(struct torture_context *torture)
                return false;
        }
 
-//     ret &= bench_cldap_netlogon(torture, address);
+       ret &= bench_cldap_netlogon(torture, address);
        ret &= bench_cldap_rootdse(torture, address);
 
        return ret;