Don't use lsa_Delete any more, as smbd now refuses it.

[kai/samba.git] / source4 / torture / rpc / session_key.c

diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c
index 69dc8da6c1b61b14e7ed0655ba58f17935972518..c069c6272408edbf39456785dec4c2856a041c66 100644 (file)
--- a/source4/torture/rpc/session_key.c
+++ b/source4/torture/rpc/session_key.c
@@ -42,7 +42,7 @@ static bool test_CreateSecret_basic(struct dcerpc_pipe *p,
        struct lsa_SetSecret r3;
        struct lsa_QuerySecret r4;
        struct policy_handle sec_handle;
-       struct lsa_Delete d;
+       struct lsa_DeleteObject d;
        struct lsa_DATA_BUF buf1;
        struct lsa_DATA_BUF_PTR bufp1;
        DATA_BLOB enc_key;
@@ -128,7 +128,8 @@ static bool test_CreateSecret_basic(struct dcerpc_pipe *p,
        torture_assert_str_equal(tctx, secret1, secret2, "Returned secret invalid");
 
        d.in.handle = &sec_handle;
-       status = dcerpc_lsa_Delete(p, tctx, &d);
+       d.out.handle = &sec_handle;
+       status = dcerpc_lsa_DeleteObject(p, tctx, &d);
        torture_assert_ntstatus_ok(tctx, status, "delete should have returned OKINVALID_HANDLE");
        return true;
 }
@@ -148,9 +149,9 @@ static bool test_secrets(struct torture_context *torture, const void *_data)
        const struct secret_settings *settings = 
                (const struct secret_settings *)_data;
 
-       lp_set_cmdline(global_loadparm, "ntlmssp client:keyexchange", settings->keyexchange?"True":"False");
-       lp_set_cmdline(global_loadparm, "ntlmssp_client:ntlm2", settings->ntlm2?"True":"False");
-       lp_set_cmdline(global_loadparm, "ntlmssp_client:lm_key", settings->lm_key?"True":"False");
+       lp_set_cmdline(torture->lp_ctx, "ntlmssp client:keyexchange", settings->keyexchange?"True":"False");
+       lp_set_cmdline(torture->lp_ctx, "ntlmssp_client:ntlm2", settings->ntlm2?"True":"False");
+       lp_set_cmdline(torture->lp_ctx, "ntlmssp_client:lm_key", settings->lm_key?"True":"False");
 
        torture_assert_ntstatus_ok(torture, torture_rpc_binding(torture, &binding), 
                                   "Getting bindoptions");
@@ -158,7 +159,11 @@ static bool test_secrets(struct torture_context *torture, const void *_data)
        binding->flags |= settings->bindoptions;
 
        torture_assert_ntstatus_ok(torture, 
-                                  dcerpc_pipe_connect_b(torture, &p, binding, &ndr_table_lsarpc, cmdline_credentials, NULL),
+                                  dcerpc_pipe_connect_b(torture, &p, binding,
+                                                        &ndr_table_lsarpc,
+                                                        cmdline_credentials,
+                                                        torture->ev,
+                                                        torture->lp_ctx),
                                   "connect");
 
        if (!test_lsa_OpenPolicy2(p, torture, &handle)) {
@@ -201,7 +206,8 @@ static struct torture_tcase *add_test(struct torture_suite *suite, uint32_t bind
        name = talloc_asprintf_append_buffer(name, " lm_key:%s", lm_key?"yes":"no");
        settings->lm_key = lm_key;
 
-       return torture_suite_add_simple_tcase(suite, name, test_secrets, settings);
+       return torture_suite_add_simple_tcase_const(suite, name, test_secrets,
+                       settings);
 }
 
 static const bool bool_vals[] = { true, false };