krb5.hin: Move krb4 function prototypes to krb54proto.h

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 85dd28ffbefaee91c94862f4fe773c632b4601b8..80fc6c49dc7161ba9ea75ae676054f2426d2adc4 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,7 @@
+1998-12-05  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * krb5.hin: Move krb4 function prototypes to krb54proto.h
+
 1998-12-04  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * krb5.hin: Add function prototypes for the new realm iterator

diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 2d846138df3954b0830f71a642e875c804b6bc10..9e5b22c90991def1845dd4cf07a1ff40c26448c0 100644 (file)
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -2397,32 +2397,5 @@ KRB5_DLLIMP void KRB5_CALLCONV krb5_realm_iterator_free
 KRB5_DLLIMP void KRB5_CALLCONV krb5_free_realm_string
        PROTOTYPE((krb5_context context, char *str));
 
-/*
- * Kerberos V4 compatibility functions
- */
-#ifndef __alpha
-#define KRB5_K4_U32    unsigned long
-#else
-#define KRB5_K4_U32    unsigned int
-#endif
-typedef struct ktext *KTEXT;
-typedef unsigned char des_cblock[8];   /* crypto-block size */
-
-extern krb5_error_code krb54_get_service_keyblock
-       PROTOTYPE((char FAR *service, char FAR *instance, char FAR *realm,
-                  int kvno, char FAR *file,
-                  krb5_keyblock FAR * keyblock));
-extern int decomp_tkt_krb5
-       PROTOTYPE((KTEXT tkt, unsigned char *flags, char *pname,
-                  char *pinstance, char *prealm, KRB5_K4_U32 *paddress,
-                  des_cblock session, int *life, KRB5_K4_U32 *time_sec, 
-                  char *sname, char *sinstance, krb5_keyblock *k5key));
-extern int krb_set_key_krb5
-       PROTOTYPE ((krb5_context ctx, krb5_keyblock *key));
-void krb_clear_key_krb5
-       PROTOTYPE ((krb5_context ctx));
-
-#undef KRB5_K4_U32
-
-
 #endif /* KRB5_GENERAL__ */
+

diff --git a/src/include/krb54proto.h b/src/include/krb54proto.h
new file mode 100644 (file)
index 0000000..8ba96fa
--- /dev/null
+++ b/src/include/krb54proto.h
@@ -0,0 +1,18 @@
+/*
+ * Kerberos V 5/4 prototypes
+ */
+
+extern krb5_error_code krb54_get_service_keyblock
+       PROTOTYPE((char FAR *service, char FAR *instance, char FAR *realm,
+                  int kvno, char FAR *file,
+                  krb5_keyblock FAR * keyblock));
+extern int decomp_tkt_krb5
+       PROTOTYPE((KTEXT tkt, unsigned char *flags, char *pname,
+                  char *pinstance, char *prealm, KRB5_K4_U32 *paddress,
+                  des_cblock session, int *life, KRB5_K4_U32 *time_sec, 
+                  char *sname, char *sinstance, krb5_keyblock *k5key));
+extern int krb_set_key_krb5
+       PROTOTYPE ((krb5_context ctx, krb5_keyblock *key));
+void krb_clear_key_krb5
+       PROTOTYPE ((krb5_context ctx));
+