diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-18 13:55:20 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-07-20 09:17:14 +1000 |
| commit | 52b28ec813ff3696606fc8f3a6bf4759a1a104e5 (patch) | |
| tree | ac253be07d5e7b58ab9b67414ac75f74d4d3fee0 /source4 | |
| parent | 03b153ce54fdae77694577f33453a19928225d00 (diff) | |
| download | samba-52b28ec813ff3696606fc8f3a6bf4759a1a104e5.tar.gz samba-52b28ec813ff3696606fc8f3a6bf4759a1a104e5.tar.bz2 samba-52b28ec813ff3696606fc8f3a6bf4759a1a104e5.zip | |
auth: Split out make_user_info_SamBaseInfo and add authenticated argument
This will allow the source3 auth code to call this without needing to
double-parse the SIDs
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/auth/gensec/gensec_krb5.c | 1 | ||||
| -rw-r--r-- | source4/auth/ntlm/auth_winbind.c | 7 | ||||
| -rw-r--r-- | source4/torture/auth/pac.c | 4 | ||||
| -rw-r--r-- | source4/torture/rpc/remote_pac.c | 1 |
4 files changed, 10 insertions, 3 deletions
diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c index c3e3b98f74..d47bc7709c 100644 --- a/source4/auth/gensec/gensec_krb5.c +++ b/source4/auth/gensec/gensec_krb5.c @@ -714,6 +714,7 @@ static NTSTATUS gensec_krb5_session_info(struct gensec_security *gensec_security nt_status = make_user_info_dc_netlogon_validation(mem_ctx, NULL, 3, &validation, + true, /* This user was authenticated */ &user_info_dc); if (!NT_STATUS_IS_OK(nt_status)) { free(principal_string); diff --git a/source4/auth/ntlm/auth_winbind.c b/source4/auth/ntlm/auth_winbind.c index da152e718a..63827ef755 100644 --- a/source4/auth/ntlm/auth_winbind.c +++ b/source4/auth/ntlm/auth_winbind.c @@ -220,6 +220,7 @@ static NTSTATUS winbind_check_password(struct auth_method_context *ctx, user_info->client.account_name, s->req.in.validation_level, &s->req.out.validation, + true, /* This user was authenticated */ user_info_dc); NT_STATUS_NOT_OK_RETURN(status); @@ -304,8 +305,10 @@ static NTSTATUS winbind_check_password_wbclient(struct auth_method_context *ctx, validation.sam3 = &info3; nt_status = make_user_info_dc_netlogon_validation(mem_ctx, - user_info->client.account_name, - 3, &validation, user_info_dc); + user_info->client.account_name, + 3, &validation, + true, /* This user was authenticated */ + user_info_dc); return nt_status; } diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c index f09e039964..4840a79b7f 100644 --- a/source4/torture/auth/pac.c +++ b/source4/torture/auth/pac.c @@ -223,7 +223,8 @@ static bool torture_pac_self_check(struct torture_context *tctx) nt_status = make_user_info_dc_netlogon_validation(mem_ctx, "", 3, &validation, - &user_info_dc_out); + true, /* This user was authenticated */ + &user_info_dc_out); if (!NT_STATUS_IS_OK(nt_status)) { torture_fail(tctx, talloc_asprintf(tctx, @@ -487,6 +488,7 @@ static bool torture_pac_saved_check(struct torture_context *tctx) nt_status = make_user_info_dc_netlogon_validation(mem_ctx, "", 3, &validation, + true, /* This user was authenticated */ &user_info_dc_out); if (!NT_STATUS_IS_OK(nt_status)) { krb5_free_keyblock_contents(smb_krb5_context->krb5_context, diff --git a/source4/torture/rpc/remote_pac.c b/source4/torture/rpc/remote_pac.c index 70912781a8..37fb8af147 100644 --- a/source4/torture/rpc/remote_pac.c +++ b/source4/torture/rpc/remote_pac.c @@ -598,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"); |