summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2003-06-12 21:48:52 +0000
committerTom Yu <tlyu@mit.edu>2003-06-12 21:48:52 +0000
commit84389168c93d63d27ed2c6846c46b23addc07c1c (patch)
tree5b8e898ae7424227584f681a48e8f7e3b0912a75 /src
parent80cd14fd363242758d85b623436988062d84b690 (diff)
downloadkrb5-84389168c93d63d27ed2c6846c46b23addc07c1c.tar.gz
krb5-84389168c93d63d27ed2c6846c46b23addc07c1c.tar.xz
krb5-84389168c93d63d27ed2c6846c46b23addc07c1c.zip
* 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
Diffstat (limited to 'src')
-rw-r--r--src/include/ChangeLog4
-rw-r--r--src/include/krb5.hin2
-rw-r--r--src/krb524/ChangeLog6
-rw-r--r--src/krb524/krb524.c7
4 files changed, 14 insertions, 5 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index abab070744..71366e826b 100644
--- 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 1f98c3d3bc..a4d7c521f4 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 dc5292b40c..e471212aaf 100644
--- 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 6d6e89d75b..1eff72f001 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 */
-