Rename interface to krb5_524_convert_creds, export it from krb5 library.

Provide old names as functions for UNIX/MacOS binary compatibility, and
deprecated macros for source code compatibility.  (For Windows, we'll still
need a krb524.dll, and it can worry about providing the old names.)  Enable
support on Windows always.

ticket: 1491
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15513 dc483132-0cff-0310-8789-dd5450dbe970

6 files changed, 44 insertions, 7 deletions

diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index 2051533052..63f623222f 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-27  Ken Raeburn  <raeburn@mit.edu>
+
+	* krb5_32.def: Add krb5_524_convert_creds.
+
 2003-05-08  Sam Hartman  <hartmans@mit.edu>
 
 	* krb5_32.def: Add krb5_c_string_to_key_with_params
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 29fdca9ce9..531a378d4c 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-27  Ken Raeburn  <raeburn@mit.edu>
+
+	* conv_creds.c: Enable support on Windows always.
+	(krb5_524_convert_creds): Renamed from krb524_convert_creds_kdc.
+	(krb524_convert_creds_kdc, krb524_init_ets) [!_WIN32]: Backwards
+	compatibility functions.
+
 2003-05-27  Sam Hartman  <hartmans@mit.edu>
 
 	* gic_keytab.c (krb5_get_in_tkt_with_keytab): as below
diff --git a/src/lib/krb5/krb/conv_creds.c b/src/lib/krb5/krb/conv_creds.c
index bf694c3370..a4e5abc946 100644
--- a/src/lib/krb5/krb/conv_creds.c
+++ b/src/lib/krb5/krb/conv_creds.c
@@ -27,7 +27,7 @@
 #include "port-sockets.h"
 #include "socket-utils.h"
 
-#ifdef KRB5_KRB4_COMPAT
+#if defined(KRB5_KRB4_COMPAT) || defined(_WIN32) /* yuck */
 #include "kerberosIV/krb.h"
 
 #ifdef USE_CCAPI
@@ -44,9 +44,9 @@ static krb5_error_code krb524_convert_creds_plain
 static int decode_v4tkt
 	(struct ktext *v4tkt, char *buf, unsigned int *encoded_len);
 
-krb5_error_code
-krb524_convert_creds_kdc(krb5_context context, krb5_creds *v5creds,
-			 CREDENTIALS *v4creds)
+krb5_error_code KRB5_CALLCONV
+krb5_524_convert_creds(krb5_context context, krb5_creds *v5creds,
+		       CREDENTIALS *v4creds)
 {
      krb5_error_code ret;
      krb5_data reply;
@@ -250,11 +250,28 @@ static int decode_v4tkt(v4tkt, buf, encoded_len)
 
 #else /* no krb4 compat */
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
+krb5_524_convert_creds(krb5_context context, krb5_creds *v5creds,
+		       struct credentials *v4creds)
+{
+    return KRB524_KRB4_DISABLED;
+}
+
+#endif
+
+/* These may be needed for object-level backwards compatibility on Mac
+   OS and UNIX, but Windows should be okay.  */
+#ifndef _WIN32
+#undef krb524_convert_creds_kdc
+krb5_error_code KRB5_CALLCONV
 krb524_convert_creds_kdc(krb5_context context, krb5_creds *v5creds,
 			 struct credentials *v4creds)
 {
-    return KRB524_KRB4_DISABLED;
+    return krb5_524_convert_creds(context, v5creds, v4creds);
 }
 
+#undef krb524_init_ets
+void KRB5_CALLCONV krb524_init_ets ()
+{
+}
 #endif
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index a99de43e1b..220468c9ce 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-27  Ken Raeburn  <raeburn@mit.edu>
+
+	* send524.c (krb5int_524_sendto_kdc): Enable support on Windows
+	always.
+
 2003-05-24  Ken Raeburn  <raeburn@mit.edu>
 
 	* send524.c: New file, moved from krb524/sendmsg.c.  Rename
diff --git a/src/lib/krb5/os/send524.c b/src/lib/krb5/os/send524.c
index f126555522..0ca8e93c33 100644
--- a/src/lib/krb5/os/send524.c
+++ b/src/lib/krb5/os/send524.c
@@ -65,7 +65,7 @@ krb5int_524_sendto_kdc (context, message, realm, reply, addr, addrlen)
     struct sockaddr *addr;
     socklen_t *addrlen;
 {
-#ifdef KRB5_KRB4_COMPAT
+#if defined(KRB5_KRB4_COMPAT) || defined(_WIN32) /* yuck! */
     int i;
     struct addrlist al = ADDRLIST_INIT;
     struct servent *serv;
diff --git a/src/lib/krb5_32.def b/src/lib/krb5_32.def
index db136c44a3..78df9a3992 100644
--- a/src/lib/krb5_32.def
+++ b/src/lib/krb5_32.def
@@ -231,6 +231,10 @@ krb5_set_password_using_ccache
 	krb5_verify_init_creds_opt_init
 	krb5_verify_init_creds_opt_set_ap_req_nofail
 
+	krb5_524_convert_creds
+; Don't add krb524_convert_creds_kdc or krb524_init_ets here;
+; they've never been exported by this library, and are deprecated. -KR
+
 	krb5int_accessor	; INTERNAL (to end all internals)
 
 ; To Add (exported on Mac OS X):