Revert "cldap benchmarks hacks ..."

This reverts commit 32860d3d29ca568e5b01e006ff93e39b4c003858.

diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c
index 3a018872af7700a45dd29e0c4dbac72b9b9b8642..6d5efb5560c9c51d8bb498aea93ccb03c1c48e33 100644 (file)
--- a/source4/cldap_server/netlogon.c
+++ b/source4/cldap_server/netlogon.c
@@ -391,10 +391,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 c96135c8add4fe876d7ecd9edf7750754d624640..b8956169d260faaab3bd323670453859f73f7d2b 100644 (file)
--- a/source4/cldap_server/rootdse.c
+++ b/source4/cldap_server/rootdse.c
@@ -158,8 +158,8 @@ 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 31186bac4f0cf0e06ecb3ac6d119c28ff18d47ee..36b319dec697261f3c0f8cc2937cb0524c4b1de1 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);
@@ -132,11 +128,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);
@@ -232,7 +224,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;