gensec: clarify memory ownership for gensec_session_info() and gensec_session_key()

[samba.git] / source4 / torture / rpc / remote_pac.c

diff --git a/source4/torture/rpc/remote_pac.c b/source4/torture/rpc/remote_pac.c
index c4efabcebc24259b4de538bfa50a6d448fb67ceb..88a40b4fe4d8ff3f9014a504b5f07632865b3f97 100644 (file)
--- a/source4/torture/rpc/remote_pac.c
+++ b/source4/torture/rpc/remote_pac.c
@@ -129,7 +129,7 @@ static bool test_PACVerify(struct torture_context *tctx,
 
        /* Extract the PAC using Samba's code */
 
-       status = gensec_session_info(gensec_server_context, &session_info);
+       status = gensec_session_info(gensec_server_context, gensec_server_context, &session_info);
        torture_assert_ntstatus_ok(tctx, status, "gensec_session_info failed");
        torture_assert(tctx, session_info->torture != NULL, "gensec_session_info failed to fill in torture sub struct");
        torture_assert(tctx, session_info->torture->pac_srv_sig != NULL, "pac_srv_sig not present");
@@ -468,7 +468,7 @@ static bool test_S2U4Self(struct torture_context *tctx,
 
        /* Extract the PAC using Samba's code */
 
-       status = gensec_session_info(gensec_server_context, &kinit_session_info);
+       status = gensec_session_info(gensec_server_context, gensec_server_context, &kinit_session_info);
        torture_assert_ntstatus_ok(tctx, status, "gensec_session_info failed");
 
 
@@ -476,8 +476,9 @@ static bool test_S2U4Self(struct torture_context *tctx,
 
        /* Wipe out any existing ccache */
        cli_credentials_invalidate_ccache(credentials, CRED_SPECIFIED);
-       cli_credentials_set_target_service(credentials, talloc_asprintf(tmp_ctx, "host/%s", test_machine_name));
-       cli_credentials_set_impersonate_principal(credentials, cli_credentials_get_principal(cmdline_credentials, tmp_ctx));
+       cli_credentials_set_impersonate_principal(credentials,
+                       cli_credentials_get_principal(cmdline_credentials, tmp_ctx),
+                       talloc_asprintf(tmp_ctx, "host/%s", test_machine_name));
 
        status = gensec_client_start(tctx, &gensec_client_context, tctx->ev,
                                     lpcfg_gensec_settings(tctx, tctx->lp_ctx));
@@ -525,11 +526,11 @@ static bool test_S2U4Self(struct torture_context *tctx,
        /* Don't pollute the remaining tests with the changed credentials */
        cli_credentials_invalidate_ccache(credentials, CRED_SPECIFIED);
        cli_credentials_set_target_service(credentials, NULL);
-       cli_credentials_set_impersonate_principal(credentials, NULL);
+       cli_credentials_set_impersonate_principal(credentials, NULL, NULL);
 
        /* Extract the PAC using Samba's code */
 
-       status = gensec_session_info(gensec_server_context, &s2u4self_session_info);
+       status = gensec_session_info(gensec_server_context, gensec_server_context, &s2u4self_session_info);
        torture_assert_ntstatus_ok(tctx, status, "gensec_session_info failed");
 
        cli_credentials_get_ntlm_username_domain(cmdline_credentials, tctx,
@@ -597,6 +598,7 @@ static bool test_S2U4Self(struct torture_context *tctx,
                                                      ninfo.identity_info.account_name.string,
                                                      r.in.validation_level,
                                                      r.out.validation,
+                                                         true, /* This user was authenticated */
                                                      &netlogon_user_info_dc);
 
        torture_assert_ntstatus_ok(tctx, status, "make_user_info_dc_netlogon_validation failed");