mirror of
https://github.com/samba-team/samba.git
synced 2025-02-28 01:58:17 +03:00
r9681: We don't need the full smb_krb5_context here, so just pass the krb5_context.
Andrew Bartlett (This used to be commit 47699019dbb7aa48e7acd6bf8364e40917db8410)
This commit is contained in:
parent
08730652fb
commit
c496f58c6f
@ -781,7 +781,7 @@ static NTSTATUS gensec_gssapi_session_info(struct gensec_security *gensec_securi
|
||||
|
||||
/* decode and verify the pac */
|
||||
nt_status = kerberos_pac_logon_info(mem_ctx, &logon_info, pac_blob,
|
||||
gensec_gssapi_state->smb_krb5_context,
|
||||
gensec_gssapi_state->smb_krb5_context->krb5_context,
|
||||
NULL, keyblock);
|
||||
|
||||
if (NT_STATUS_IS_OK(nt_status)) {
|
||||
|
@ -450,7 +450,7 @@ static NTSTATUS gensec_krb5_session_info(struct gensec_security *gensec_security
|
||||
|
||||
/* decode and verify the pac */
|
||||
nt_status = kerberos_pac_logon_info(gensec_krb5_state, &logon_info, gensec_krb5_state->pac,
|
||||
gensec_krb5_state->smb_krb5_context,
|
||||
gensec_krb5_state->smb_krb5_context->krb5_context,
|
||||
NULL, gensec_krb5_state->keyblock);
|
||||
|
||||
/* IF we have the PAC - otherwise we need to get this
|
||||
|
@ -129,13 +129,13 @@ NTSTATUS create_memory_keytab(TALLOC_CTX *parent_ctx,
|
||||
NTSTATUS kerberos_decode_pac(TALLOC_CTX *mem_ctx,
|
||||
struct PAC_DATA **pac_data_out,
|
||||
DATA_BLOB blob,
|
||||
struct smb_krb5_context *smb_krb5_context,
|
||||
krb5_context context,
|
||||
krb5_keyblock *krbtgt_keyblock,
|
||||
krb5_keyblock *service_keyblock);
|
||||
NTSTATUS kerberos_pac_logon_info(TALLOC_CTX *mem_ctx,
|
||||
struct PAC_LOGON_INFO **logon_info,
|
||||
DATA_BLOB blob,
|
||||
struct smb_krb5_context *smb_krb5_context,
|
||||
krb5_context context,
|
||||
krb5_keyblock *krbtgt_keyblock,
|
||||
krb5_keyblock *service_keyblock);
|
||||
krb5_error_code kerberos_create_pac(TALLOC_CTX *mem_ctx,
|
||||
|
@ -80,7 +80,7 @@ static NTSTATUS check_pac_checksum(TALLOC_CTX *mem_ctx,
|
||||
NTSTATUS kerberos_decode_pac(TALLOC_CTX *mem_ctx,
|
||||
struct PAC_DATA **pac_data_out,
|
||||
DATA_BLOB blob,
|
||||
struct smb_krb5_context *smb_krb5_context,
|
||||
krb5_context context,
|
||||
krb5_keyblock *krbtgt_keyblock,
|
||||
krb5_keyblock *service_keyblock)
|
||||
{
|
||||
@ -165,7 +165,7 @@ static NTSTATUS check_pac_checksum(TALLOC_CTX *mem_ctx,
|
||||
/* verify by service_key */
|
||||
status = check_pac_checksum(mem_ctx,
|
||||
modified_pac_blob, &srv_sig,
|
||||
smb_krb5_context->krb5_context,
|
||||
context,
|
||||
service_keyblock);
|
||||
if (!NT_STATUS_IS_OK(status)) {
|
||||
DEBUG(1, ("PAC Decode: Failed to verify the service signature\n"));
|
||||
@ -178,7 +178,7 @@ static NTSTATUS check_pac_checksum(TALLOC_CTX *mem_ctx,
|
||||
|
||||
status = check_pac_checksum(mem_ctx,
|
||||
service_checksum_blob, &kdc_sig,
|
||||
smb_krb5_context->krb5_context, krbtgt_keyblock);
|
||||
context, krbtgt_keyblock);
|
||||
if (!NT_STATUS_IS_OK(status)) {
|
||||
DEBUG(1, ("PAC Decode: Failed to verify the krbtgt signature\n"));
|
||||
return status;
|
||||
@ -203,7 +203,7 @@ static NTSTATUS check_pac_checksum(TALLOC_CTX *mem_ctx,
|
||||
NTSTATUS kerberos_pac_logon_info(TALLOC_CTX *mem_ctx,
|
||||
struct PAC_LOGON_INFO **logon_info,
|
||||
DATA_BLOB blob,
|
||||
struct smb_krb5_context *smb_krb5_context,
|
||||
krb5_context context,
|
||||
krb5_keyblock *krbtgt_keyblock,
|
||||
krb5_keyblock *service_keyblock)
|
||||
{
|
||||
@ -213,7 +213,7 @@ static NTSTATUS check_pac_checksum(TALLOC_CTX *mem_ctx,
|
||||
|
||||
nt_status = kerberos_decode_pac(mem_ctx, &pac_data,
|
||||
blob,
|
||||
smb_krb5_context,
|
||||
context,
|
||||
krbtgt_keyblock,
|
||||
service_keyblock);
|
||||
if (!NT_STATUS_IS_OK(nt_status)) {
|
||||
|
@ -126,7 +126,7 @@ static BOOL torture_pac_self_check(void)
|
||||
/* Now check that we can read it back */
|
||||
nt_status = kerberos_decode_pac(mem_ctx, &pac_data,
|
||||
tmp_blob,
|
||||
smb_krb5_context,
|
||||
smb_krb5_context->krb5_context,
|
||||
&krbtgt_keyblock,
|
||||
&server_keyblock);
|
||||
|
||||
@ -145,7 +145,7 @@ static BOOL torture_pac_self_check(void)
|
||||
/* Now check that we can read it back */
|
||||
nt_status = kerberos_pac_logon_info(mem_ctx, &logon_info,
|
||||
tmp_blob,
|
||||
smb_krb5_context,
|
||||
smb_krb5_context->krb5_context,
|
||||
&krbtgt_keyblock,
|
||||
&server_keyblock);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user