Revert "HACK: computer_name must match NTLMv2 name... invalidAuthenticate2"

This reverts commit e3c6e958e26a1a98e64185c787b950a3db678739.

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 8f82a8155413cfe90cdb5b547873e25f2e3b0735..52c443e39f3c744369edf83dcd56f04a9c8d6081 100644 (file)
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -968,7 +968,7 @@ static bool test_netlogon_ops_args(struct dcerpc_pipe *p, struct torture_context
        chal = data_blob_const(ninfo.challenge,
                               sizeof(ninfo.challenge));
 
-       names_blob = NTLMv2_generate_names_blob(tctx, creds->computer_name,// cli_credentials_get_workstation(credentials),
+       names_blob = NTLMv2_generate_names_blob(tctx, cli_credentials_get_workstation(credentials),
                                                cli_credentials_get_domain(credentials));
 
        status = cli_credentials_get_ntlm_response(
@@ -994,7 +994,7 @@ static bool test_netlogon_ops_args(struct dcerpc_pipe *p, struct torture_context
        logon.network = &ninfo;
 
        r.in.server_name = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
-       r.in.computer_name = creds->computer_name;//cli_credentials_get_workstation(credentials);
+       r.in.computer_name = cli_credentials_get_workstation(credentials);
        r.in.credential = &auth;
        r.in.return_authenticator = &auth2;
        r.in.logon_level = NetlogonNetworkInformation;
@@ -1237,7 +1237,6 @@ static bool test_invalidAuthenticate2(struct torture_context *tctx,
                return false;
        }
 
-       return test_netlogon_ops(p, tctx, credentials, creds);
        return true;
 }
 
@@ -4965,14 +4964,6 @@ struct torture_suite *torture_rpc_netlogon(TALLOC_CTX *mem_ctx)
        torture_rpc_tcase_add_test(tcase, "lsa_over_netlogon", test_lsa_over_netlogon);
        torture_rpc_tcase_add_test_creds(tcase, "SetupCredentialsDowngrade", test_SetupCredentialsDowngrade);
 
-       tcase = torture_suite_add_machine_workstation_rpc_iface_tcase(suite, "netlogon.wks",
-                                                 &ndr_table_netlogon, TEST_MACHINE_NAME);
-
-       torture_rpc_tcase_add_test(tcase, "Broken RPC binding handle",
-                                  test_netr_broken_binding_handle);
-       torture_rpc_tcase_add_test_creds(tcase, "SamLogon", test_SamLogon);
-       torture_rpc_tcase_add_test_creds(tcase, "invalidAuthenticate2", test_invalidAuthenticate2);
-
        return suite;
 }