* 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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index abab0707445122d480f9497e4147364c3778f49a..71366e826b6221ac43f0cec582347ee128743fb0 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-12  Tom Yu  <tlyu@mit.edu>
+
+       * krb5.hin: krb524_init_ets() takes one argument.
+
 2003-06-06  Ken Raeburn  <raeburn@mit.edu>
 
        * k5-int.h (struct srv_dns_entry): Declare.

diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 1f98c3d3bc9fae3d8eb14a6f3efb2f3e81ee9f12..a4d7c521f43a4473de0fc349be89c9fcfeae828a 100644 (file)
--- 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 dc5292b40cd527b07cb84e634097960b08269525..e471212aaf1af9ccb7cd842dd3b8dde61be1b824 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-12  Tom Yu  <tlyu@mit.edu>
+
+       * 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  <tlyu@mit.edu>
 
        * krb524.c: Fix copyright notice.

diff --git a/src/krb524/krb524.c b/src/krb524/krb524.c
index 6d6e89d75b9463992aa1488211e6bf3fec454651..1eff72f00191caf04fb4aadcaece76fbc033cd53 100644 (file)
--- 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 */
-