summaryrefslogtreecommitdiff
path: root/source4/auth
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-08-27 12:23:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:34:40 -0500
commitc496f58c6fcd8d2c90ddcdf2dc4c3e4c41acd74b (patch)
treecd8d07f0e042d0448536ce5a4098747dc2e06d48 /source4/auth
parent08730652fbf1c9f6d53378b1b094a2c5ddf2cf62 (diff)
downloadsamba-c496f58c6fcd8d2c90ddcdf2dc4c3e4c41acd74b.tar.gz
samba-c496f58c6fcd8d2c90ddcdf2dc4c3e4c41acd74b.tar.bz2
samba-c496f58c6fcd8d2c90ddcdf2dc4c3e4c41acd74b.zip
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)
Diffstat (limited to 'source4/auth')
-rw-r--r--source4/auth/gensec/gensec_gssapi.c2
-rw-r--r--source4/auth/gensec/gensec_krb5.c2
-rw-r--r--source4/auth/kerberos/kerberos.h4
-rw-r--r--source4/auth/kerberos/kerberos_pac.c10
4 files changed, 9 insertions, 9 deletions
diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c
index 2eaad7100c..64a6f8be77 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -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)) {
diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c
index 2568f11006..a89f46a411 100644
--- a/source4/auth/gensec/gensec_krb5.c
+++ b/source4/auth/gensec/gensec_krb5.c
@@ -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
diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h
index 33be657ce8..954ac7dc57 100644
--- a/source4/auth/kerberos/kerberos.h
+++ b/source4/auth/kerberos/kerberos.h
@@ -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,
diff --git a/source4/auth/kerberos/kerberos_pac.c b/source4/auth/kerberos/kerberos_pac.c
index 9617e4fd01..b26a25eac1 100644
--- a/source4/auth/kerberos/kerberos_pac.c
+++ b/source4/auth/kerberos/kerberos_pac.c
@@ -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)) {