svn commit: samba r9681 - in branches/SAMBA_4_0/source: auth/gensec
auth/kerberos torture/auth
abartlet at samba.org
abartlet at samba.org
Sat Aug 27 12:23:38 GMT 2005
Author: abartlet
Date: 2005-08-27 12:23:37 +0000 (Sat, 27 Aug 2005)
New Revision: 9681
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9681
Log:
We don't need the full smb_krb5_context here, so just pass the krb5_context.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c
branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c
branches/SAMBA_4_0/source/auth/kerberos/kerberos.h
branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c
branches/SAMBA_4_0/source/torture/auth/pac.c
Changeset:
Modified: branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c 2005-08-27 11:49:06 UTC (rev 9680)
+++ branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c 2005-08-27 12:23:37 UTC (rev 9681)
@@ -781,7 +781,7 @@
/* 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)) {
Modified: branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c 2005-08-27 11:49:06 UTC (rev 9680)
+++ branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c 2005-08-27 12:23:37 UTC (rev 9681)
@@ -450,7 +450,7 @@
/* 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
Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos.h
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/kerberos.h 2005-08-27 11:49:06 UTC (rev 9680)
+++ branches/SAMBA_4_0/source/auth/kerberos/kerberos.h 2005-08-27 12:23:37 UTC (rev 9681)
@@ -129,13 +129,13 @@
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,
Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c 2005-08-27 11:49:06 UTC (rev 9680)
+++ branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c 2005-08-27 12:23:37 UTC (rev 9681)
@@ -80,7 +80,7 @@
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 @@
/* 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 @@
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 @@
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 @@
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)) {
Modified: branches/SAMBA_4_0/source/torture/auth/pac.c
===================================================================
--- branches/SAMBA_4_0/source/torture/auth/pac.c 2005-08-27 11:49:06 UTC (rev 9680)
+++ branches/SAMBA_4_0/source/torture/auth/pac.c 2005-08-27 12:23:37 UTC (rev 9681)
@@ -126,7 +126,7 @@
/* 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 @@
/* 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);
More information about the samba-cvs
mailing list