From 743ccd85cf602125137f27b833db15f0658cfd5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Mon, 27 Aug 2007 14:21:04 +0000 Subject: [PATCH] make work with cpp again, reported by Hai Zaar git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21934 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/krb5.h | 9 +++++---- lib/krb5/pac.c | 22 +++++++++++----------- lib/krb5/rd_req.c | 21 +++++++++++---------- lib/krb5/send_to_kdc.c | 2 +- lib/krb5/test_pac.c | 4 ++-- 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h index df715c389..660c938e7 100644 --- a/lib/krb5/krb5.h +++ b/lib/krb5/krb5.h @@ -80,10 +80,11 @@ typedef struct krb5_digest_data *krb5_digest; struct krb5_ntlm_data; typedef struct krb5_ntlm_data *krb5_ntlm; -typedef struct krb5_pac *krb5_pac; +struct krb5_pac_data; +typedef struct krb5_pac_data *krb5_pac; -typedef struct krb5_rd_req_in_ctx *krb5_rd_req_in_ctx; -typedef struct krb5_rd_req_out_ctx *krb5_rd_req_out_ctx; +typedef struct krb5_rd_req_in_ctx_data *krb5_rd_req_in_ctx; +typedef struct krb5_rd_req_out_ctx_data *krb5_rd_req_out_ctx; typedef CKSUMTYPE krb5_cksumtype; @@ -753,7 +754,7 @@ enum { KRB5_PRINCIPAL_UNPARSE_DISPLAY = 4 }; -typedef struct krb5_sendto_ctx *krb5_sendto_ctx; +typedef struct krb5_sendto_ctx_data *krb5_sendto_ctx; #define KRB5_SENDTO_DONE 0 #define KRB5_SENDTO_RESTART 1 diff --git a/lib/krb5/pac.c b/lib/krb5/pac.c index ca3cbadef..ec04e3e78 100644 --- a/lib/krb5/pac.c +++ b/lib/krb5/pac.c @@ -48,7 +48,7 @@ struct PACTYPE { struct PAC_INFO_BUFFER buffers[1]; }; -struct krb5_pac { +struct krb5_pac_data { struct PACTYPE *pac; krb5_data data; struct PAC_INFO_BUFFER *server_checksum; @@ -82,10 +82,10 @@ static const char zeros[PAC_ALIGNMENT] = { 0 }; krb5_error_code krb5_pac_parse(krb5_context context, const void *ptr, size_t len, - struct krb5_pac **pac) + krb5_pac *pac) { krb5_error_code ret; - struct krb5_pac *p; + krb5_pac p; krb5_storage *sp = NULL; uint32_t i, tmp, tmp2, header_end; @@ -216,10 +216,10 @@ out: } krb5_error_code -krb5_pac_init(krb5_context context, struct krb5_pac **pac) +krb5_pac_init(krb5_context context, krb5_pac *pac) { krb5_error_code ret; - struct krb5_pac *p; + krb5_pac p; p = calloc(1, sizeof(*p)); if (p == NULL) { @@ -248,7 +248,7 @@ krb5_pac_init(krb5_context context, struct krb5_pac **pac) } krb5_error_code -krb5_pac_add_buffer(krb5_context context, struct krb5_pac *p, +krb5_pac_add_buffer(krb5_context context, krb5_pac p, uint32_t type, const krb5_data *data) { krb5_error_code ret; @@ -316,7 +316,7 @@ krb5_pac_add_buffer(krb5_context context, struct krb5_pac *p, } krb5_error_code -krb5_pac_get_buffer(krb5_context context, struct krb5_pac *p, +krb5_pac_get_buffer(krb5_context context, krb5_pac p, uint32_t type, krb5_data *data) { krb5_error_code ret; @@ -361,7 +361,7 @@ krb5_pac_get_buffer(krb5_context context, struct krb5_pac *p, krb5_error_code krb5_pac_get_types(krb5_context context, - struct krb5_pac *p, + krb5_pac p, size_t *len, uint32_t **types) { @@ -385,7 +385,7 @@ krb5_pac_get_types(krb5_context context, */ void -krb5_pac_free(krb5_context context, struct krb5_pac *pac) +krb5_pac_free(krb5_context context, krb5_pac pac) { krb5_data_free(&pac->data); free(pac->pac); @@ -703,7 +703,7 @@ out: krb5_error_code krb5_pac_verify(krb5_context context, - const struct krb5_pac *pac, + const krb5_pac pac, time_t authtime, krb5_const_principal principal, const krb5_keyblock *server, @@ -840,7 +840,7 @@ pac_checksum(krb5_context context, krb5_error_code _krb5_pac_sign(krb5_context context, - struct krb5_pac *p, + krb5_pac p, time_t authtime, krb5_principal principal, const krb5_keyblock *server_key, diff --git a/lib/krb5/rd_req.c b/lib/krb5/rd_req.c index 89c192183..b7f3727cb 100644 --- a/lib/krb5/rd_req.c +++ b/lib/krb5/rd_req.c @@ -512,13 +512,13 @@ krb5_verify_ap_req2(krb5_context context, * */ -struct krb5_rd_req_in_ctx { +struct krb5_rd_req_in_ctx_data { krb5_keytab keytab; krb5_keyblock *keyblock; krb5_boolean no_pac_check; }; -struct krb5_rd_req_out_ctx { +struct krb5_rd_req_out_ctx_data { krb5_keyblock *keyblock; krb5_flags ap_req_options; krb5_ticket *ticket; @@ -826,14 +826,15 @@ krb5_rd_req_ctx(krb5_context context, goto out; } - ret = krb5_verify_ap_req(context, - auth_context, - &ap_req, - server, - o->keyblock, - 0, - &o->ap_req_options, - &o->ticket); + ret = krb5_verify_ap_req2(context, + auth_context, + &ap_req, + server, + o->keyblock, + 0, + &o->ap_req_options, + &o->ticket, + KRB5_KU_AP_REQ_AUTH); if (ret) goto out; diff --git a/lib/krb5/send_to_kdc.c b/lib/krb5/send_to_kdc.c index 5f49a198a..4292311c4 100644 --- a/lib/krb5/send_to_kdc.c +++ b/lib/krb5/send_to_kdc.c @@ -448,7 +448,7 @@ krb5_set_send_to_kdc_func(krb5_context context, return 0; } -struct krb5_sendto_ctx { +struct krb5_sendto_ctx_data { int flags; int type; krb5_sendto_ctx_func func; diff --git a/lib/krb5/test_pac.c b/lib/krb5/test_pac.c index 9d6a409ae..7537f1b49 100644 --- a/lib/krb5/test_pac.c +++ b/lib/krb5/test_pac.c @@ -102,7 +102,7 @@ main(int argc, char **argv) { krb5_error_code ret; krb5_context context; - struct krb5_pac *pac; + krb5_pac pac; krb5_data data; krb5_principal p; @@ -144,7 +144,7 @@ main(int argc, char **argv) { uint32_t *list; size_t len, i; - struct krb5_pac *pac2; + krb5_pac pac2; ret = krb5_pac_init(context, &pac2); if (ret)