From 84389168c93d63d27ed2c6846c46b23addc07c1c Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Thu, 12 Jun 2003 21:48:52 +0000 Subject: [PATCH] * krb5.hin: krb524_init_ets() takes one argument * krb524.c (krb524_convert_creds_kdc, krb524_init_ets): Mark as KRB5_CALLCONV_WRONG. (krb524_init_ets): Takes a krb5_context. ticket: 1596 tags: pullup git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15615 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/ChangeLog | 4 ++++ src/include/krb5.hin | 2 +- src/krb524/ChangeLog | 6 ++++++ src/krb524/krb524.c | 7 +++---- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/include/ChangeLog b/src/include/ChangeLog index abab07074..71366e826 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,7 @@ +2003-06-12 Tom Yu + + * krb5.hin: krb524_init_ets() takes one argument. + 2003-06-06 Ken Raeburn * k5-int.h (struct srv_dns_entry): Declare. diff --git a/src/include/krb5.hin b/src/include/krb5.hin index 1f98c3d3b..a4d7c521f 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -1667,7 +1667,7 @@ int KRB5_CALLCONV krb5_524_convert_creds struct credentials *v4creds); #if KRB5_DEPRECATED #define krb524_convert_creds_kdc krb5_524_convert_creds -#define krb524_init_ets() (0) +#define krb524_init_ets(x) (0) #endif /* libkt.spec */ diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index dc5292b40..e471212aa 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,3 +1,9 @@ +2003-06-12 Tom Yu + + * krb524.c (krb524_convert_creds_kdc, krb524_init_ets): Mark as + KRB5_CALLCONV_WRONG. + (krb524_init_ets): Takes a krb5_context. + 2003-06-09 Tom Yu * krb524.c: Fix copyright notice. diff --git a/src/krb524/krb524.c b/src/krb524/krb524.c index 6d6e89d75..1eff72f00 100644 --- a/src/krb524/krb524.c +++ b/src/krb524/krb524.c @@ -33,16 +33,15 @@ #undef krb524_init_ets #endif -int KRB5_CALLCONV +int KRB5_CALLCONV_WRONG krb524_convert_creds_kdc(krb5_context context, krb5_creds *v5creds, struct credentials *v4creds) { return(krb5_524_convert_creds(context,v5creds,v4creds)); } -void KRB5_CALLCONV -krb524_init_ets(void) +void KRB5_CALLCONV_WRONG +krb524_init_ets(krb5_context context) { /* no-op */ } #endif /* _WIN32 */ - -- 2.26.2