diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-01-11 18:07:41 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-01-12 18:02:54 +1100 |
| commit | b69c40ffce7d1ab8828ec6a1df1d46f7e8c51278 (patch) | |
| tree | f81c54995e2c3eeb97ab9af08e268c2e9a19c3f6 | |
| parent | 49f8113fabd2603b45439404c91d350b4d6eaeac (diff) | |
| download | samba-b69c40ffce7d1ab8828ec6a1df1d46f7e8c51278.tar.gz samba-b69c40ffce7d1ab8828ec6a1df1d46f7e8c51278.tar.bz2 samba-b69c40ffce7d1ab8828ec6a1df1d46f7e8c51278.zip | |
auth/kerberos: Remove unused TALLOC_CTX argument to check_pac_checksum
| -rw-r--r-- | auth/kerberos/kerberos_pac.c | 9 | ||||
| -rw-r--r-- | libcli/auth/krb5_wrap.h | 3 | ||||
| -rw-r--r-- | source4/kdc/pac-glue.c | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/auth/kerberos/kerberos_pac.c b/auth/kerberos/kerberos_pac.c index 97fce7372b..5155c9fd28 100644 --- a/auth/kerberos/kerberos_pac.c +++ b/auth/kerberos/kerberos_pac.c @@ -28,8 +28,7 @@ #include "librpc/gen_ndr/ndr_krb5pac.h" #include "libcli/auth/krb5_wrap.h" -krb5_error_code check_pac_checksum(TALLOC_CTX *mem_ctx, - DATA_BLOB pac_data, +krb5_error_code check_pac_checksum(DATA_BLOB pac_data, struct PAC_SIGNATURE_DATA *sig, krb5_context context, const krb5_keyblock *keyblock) @@ -304,8 +303,7 @@ NTSTATUS kerberos_decode_pac(TALLOC_CTX *mem_ctx, if (service_keyblock) { /* verify by service_key */ - ret = check_pac_checksum(tmp_ctx, - modified_pac_blob, srv_sig_ptr, + ret = check_pac_checksum(modified_pac_blob, srv_sig_ptr, context, service_keyblock); if (ret) { @@ -316,8 +314,7 @@ NTSTATUS kerberos_decode_pac(TALLOC_CTX *mem_ctx, if (krbtgt_keyblock) { /* verify the service key checksum by krbtgt_key */ - ret = check_pac_checksum(tmp_ctx, - srv_sig_ptr->signature, kdc_sig_ptr, + ret = check_pac_checksum(srv_sig_ptr->signature, kdc_sig_ptr, context, krbtgt_keyblock); if (ret) { DEBUG(1, ("PAC Decode: Failed to verify the KDC signature: %s\n", diff --git a/libcli/auth/krb5_wrap.h b/libcli/auth/krb5_wrap.h index affb892b57..814c427a56 100644 --- a/libcli/auth/krb5_wrap.h +++ b/libcli/auth/krb5_wrap.h @@ -58,8 +58,7 @@ char *gssapi_error_string(TALLOC_CTX *mem_ctx, const gss_OID mech); char *smb_get_krb5_error_message(krb5_context context, krb5_error_code code, TALLOC_CTX *mem_ctx); -krb5_error_code check_pac_checksum(TALLOC_CTX *mem_ctx, - DATA_BLOB pac_data, +krb5_error_code check_pac_checksum(DATA_BLOB pac_data, struct PAC_SIGNATURE_DATA *sig, krb5_context context, const krb5_keyblock *keyblock); diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c index 3983d7b201..3b0f00f850 100644 --- a/source4/kdc/pac-glue.c +++ b/source4/kdc/pac-glue.c @@ -489,7 +489,7 @@ int kdc_check_pac(krb5_context context, keyblock = key->key; - return check_pac_checksum(NULL, srv_sig, kdc_sig, + return check_pac_checksum(srv_sig, kdc_sig, context, &keyblock); } |