From 76d46a4051a66bd6258435ae6199e1e7d1110b24 Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Fri, 22 Jun 2001 18:19:55 +0000 Subject: [PATCH] * krb5.hin: Do not use "random_key" as argument name. When krb.h included, it gets redefined. Do not use "options" either. * k5-int.h (krb5_get_init_creds): Do not use "options" as argument name. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13499 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/ChangeLog | 8 ++++++++ src/include/k5-int.h | 2 +- src/include/krb5.hin | 12 ++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 6455c7950..95f91e7ba 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,11 @@ +2001-06-22 Ezra Peisach + + * krb5.hin: Do not use "random_key" as argument name. When krb.h + included, it gets redefined. Do not use "options" either. + + * k5-int.h (krb5_get_init_creds): Do not use "options" as argument + name. + 2001-06-20 Ezra Peisach * krb5.hin: Move prototypes for krb5_net_read() and diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 53aca1215..2079c275c 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -960,7 +960,7 @@ krb5_get_init_creds void *prompter_data, krb5_deltat start_time, char *in_tkt_service, - krb5_get_init_creds_opt *options, + krb5_get_init_creds_opt *gic_options, krb5_gic_get_as_key_fct gak, void *gak_data, int master, diff --git a/src/include/krb5.hin b/src/include/krb5.hin index 140f3a3b4..242afe220 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -397,7 +397,7 @@ KRB5_DLLIMP krb5_error_code KRB5_CALLCONV KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_c_make_random_key (krb5_context context, krb5_enctype enctype, - krb5_keyblock *random_key); + krb5_keyblock *k5_random_key); KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_c_random_make_octets @@ -2280,7 +2280,7 @@ krb5_get_init_creds_password void *data, krb5_deltat start_time, char *in_tkt_service, - krb5_get_init_creds_opt *options); + krb5_get_init_creds_opt *k5_gic_options); KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_get_init_creds_keytab @@ -2290,7 +2290,7 @@ krb5_get_init_creds_keytab krb5_keytab arg_keytab, krb5_deltat start_time, char *in_tkt_service, - krb5_get_init_creds_opt *options); + krb5_get_init_creds_opt *k5_gic_options); typedef struct _krb5_verify_init_creds_opt { krb5_flags flags; @@ -2301,10 +2301,10 @@ typedef struct _krb5_verify_init_creds_opt { KRB5_DLLIMP void KRB5_CALLCONV krb5_verify_init_creds_opt_init -(krb5_verify_init_creds_opt *options); +(krb5_verify_init_creds_opt *k5_vic_options); KRB5_DLLIMP void KRB5_CALLCONV krb5_verify_init_creds_opt_set_ap_req_nofail -(krb5_verify_init_creds_opt *options, +(krb5_verify_init_creds_opt *k5_vic_options, int ap_req_nofail); KRB5_DLLIMP krb5_error_code KRB5_CALLCONV @@ -2314,7 +2314,7 @@ krb5_verify_init_creds krb5_principal ap_req_server, krb5_keytab ap_req_keytab, krb5_ccache *ccache, - krb5_verify_init_creds_opt *options); + krb5_verify_init_creds_opt *k5_vic_options); KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_get_validated_creds -- 2.26.2