summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/ChangeLog7
-rw-r--r--src/include/k5-int.h3
-rw-r--r--src/include/krb5.hin13
3 files changed, 17 insertions, 6 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 301d9b833..3ed279580 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,5 +1,12 @@
2003-05-27 Ken Raeburn <raeburn@mit.edu>
+ * k5-int.h (KRB524_SERVICE, KRB524_PORT): Moved here...
+ * krb5.h: ...from here.
+ (krb5_524_convert_creds): Renamed from krb524_convert_creds_kdc,
+ fixed calling convention spec.
+ (krb524_convert_creds_kdc, krb524_init_ets) [KRB5_DEPRECATED]: New
+ macros.
+
* Makefile.in (clean-windows): Remove new "timestamp" file when
cleaning up.
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 73f0dac33..2139b86d7 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -1683,6 +1683,9 @@ krb5_error_code KRB5_CALLCONV krb5int_accessor
in fact a krb4 ticket, so we don't want to drag in the krb4 support
just to enable this. */
+#define KRB524_SERVICE "krb524"
+#define KRB524_PORT 4444
+
/* v4lifetime.c */
extern krb5_int32 krb5int_krb_life_to_time(krb5_int32, int);
extern int krb5int_krb_time_to_life(krb5_int32, krb5_int32);
diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 96fd0c899..1f98c3d3b 100644
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -1661,13 +1661,14 @@ krb5_error_code KRB5_CALLCONV krb5_524_conv_principal
(krb5_context context, krb5_const_principal princ,
char *name, char *inst, char *realm);
-#define KRB524_SERVICE "krb524"
-#define KRB524_PORT 4444
-
struct credentials;
-int krb524_convert_creds_kdc
- (krb5_context context, krb5_creds *v5creds,
- struct credentials *v4creds);
+int KRB5_CALLCONV krb5_524_convert_creds
+ (krb5_context context, krb5_creds *v5creds,
+ struct credentials *v4creds);
+#if KRB5_DEPRECATED
+#define krb524_convert_creds_kdc krb5_524_convert_creds
+#define krb524_init_ets() (0)
+#endif
/* libkt.spec */
#if KRB5_PRIVATE