* krb4int.h: Add prototypes for ad_print, krb_svc_init,

        krb_svc_init_preauth, krb_get_svc_in_tkt_preauth, kset_logfile,
        krb_log, krb_set_logfile, krb_set_lifetime, month_sname,
        krb_rd_preauth, krb_net_rd_preauth, krb_net_rd_sendauth,
        krb_stime, krb_start_session, krb_end_session,
        krb_get_default_user, krb_set_default_user.

        * ad_print.c, g_svc_in_tkt.c, klog.c, log.c, mk_req.c,
        month_sname.c, rd_preauth.c, sendauth.c, stime.c, unix_glue.c:
        Include krb4int.h for prototypes.

        * decomp_tkt.c: Include krb54proto.h for decomp_tkt_krb5()
          prototype.

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

13 files changed, 77 insertions, 10 deletions

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 82a4639971..7b93d34d4f 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,18 @@
+2001-06-27  Ezra Peisach  <epeisach@mit.edu>
+
+	* krb4int.h: Add prototypes for ad_print, krb_svc_init,
+	krb_svc_init_preauth, krb_get_svc_in_tkt_preauth, kset_logfile,
+	krb_log, krb_set_logfile, krb_set_lifetime, month_sname,
+	krb_rd_preauth, krb_net_rd_preauth, krb_net_rd_sendauth,
+	krb_stime, krb_start_session, krb_end_session,
+	krb_get_default_user, krb_set_default_user.
+
+	* ad_print.c, g_svc_in_tkt.c, klog.c, log.c, mk_req.c,
+ 	month_sname.c, rd_preauth.c, sendauth.c, stime.c, unix_glue.c:
+ 	Include krb4int.h for prototypes.
+
+	* decomp_tkt.c: Include krb54proto.h for decomp_tkt_krb5() prototype.
+
 2001-06-26  Ezra Peisach  <epeisach@mit.edu>
 
 	* krb4int.h: Add prototypes for krb__get_realmsfile(),
diff --git a/src/lib/krb4/ad_print.c b/src/lib/krb4/ad_print.c
index 76db6a84be..c6779047af 100644
--- a/src/lib/krb4/ad_print.c
+++ b/src/lib/krb4/ad_print.c
@@ -13,6 +13,7 @@
 #define	DEFINE_SOCKADDR		/* Request definitions for sockets */
 #include "krb.h"
 #include "des.h"
+#include "krb4int.h"
 #include <stdio.h>
 
 #ifndef _WINDOWS
diff --git a/src/lib/krb4/decomp_tkt.c b/src/lib/krb4/decomp_tkt.c
index 597be9ab6b..84419d5b5f 100644
--- a/src/lib/krb4/decomp_tkt.c
+++ b/src/lib/krb4/decomp_tkt.c
@@ -29,6 +29,7 @@
 #include "prot.h"
 #include <string.h>
 #include <krb5.h>
+#include "krb54proto.h"
 
 #ifdef KRB_CRYPT_DEBUG
 extern int krb_debug;
diff --git a/src/lib/krb4/g_svc_in_tkt.c b/src/lib/krb4/g_svc_in_tkt.c
index 7d4baf6ddd..603a9037c9 100644
--- a/src/lib/krb4/g_svc_in_tkt.c
+++ b/src/lib/krb4/g_svc_in_tkt.c
@@ -10,6 +10,7 @@
 #include "mit-copyright.h"
 #include "krb.h"
 #include "prot.h"
+#include "krb4int.h"
 #include <string.h>
 
 #ifndef NULL
diff --git a/src/lib/krb4/klog.c b/src/lib/krb4/klog.c
index 5805a94d29..29778c4c5f 100644
--- a/src/lib/krb4/klog.c
+++ b/src/lib/krb4/klog.c
@@ -18,7 +18,7 @@
 #endif
 #include <stdio.h>
 
-#include "krb.h"
+#include "krb4int.h"
 #include <klog.h>
 
 static char *log_name = KRBLOG;
@@ -56,7 +56,6 @@ char * klog(type,format,a1,a2,a3,a4,a5,a6,a7,a8,a9,a0)
 {
     FILE *logfile;
     time_t now;
-    char *month_sname();
     struct tm *tm;
     static int logtype_array[NLOGTYPE];
     static int array_initialized;
diff --git a/src/lib/krb4/krb4int.h b/src/lib/krb4/krb4int.h
index 2525d77abe..49aec2b42f 100644
--- a/src/lib/krb4/krb4int.h
+++ b/src/lib/krb4/krb4int.h
@@ -2,17 +2,63 @@
  * be available for self consistancy in the library.
  */
 
+/* ad_print.c */
+void ad_print(AUTH_DAT *x);
+
 /* getst.c */
 int getst(int, char *, int);
 
-/* tf_util.c */
-int tf_save_cred(char *, char *, char *, C_Block, int , int, KTEXT, long);
-
 /* g_cnffile.c */
 FILE *krb__get_realmsfile(void);
 
 FILE *krb__get_cnffile(void);
 
+/* g_svc_in_tkt.c */
+int krb_svc_init(char *, char *, char *, int, char *, char *);
+int krb_svc_init_preauth(char *, char *, char *, int, char *, char *);
+
+int krb_get_svc_in_tkt_preauth(char *, char *, char *, char *, char *, int, char *);
+
 /* gethostname.c */
 int k_gethostname(char *, int);
 
+/* klog.c */
+void kset_logfile(char *);
+
+/* log.c */
+void krb_log(char *, char *, char *, char *, char *, char *, char *, 
+	     char *, char *, char *, char *);
+
+void krb_set_logfile(char *);
+
+/* mk_req.c */
+int krb_set_lifetime(int);
+
+/* month_sname.c */
+const char * month_sname(int);
+
+/* rd_preauth.c */
+#ifdef KRB_DB_DEFS
+int krb_rd_preauth(KTEXT, char *, int, Principal *, des_cblock);
+#endif
+
+/* sendauth.c */
+int krb_net_rd_sendauth(int, KTEXT, char *);
+
+/* stime.c */
+char *krb_stime(long *);
+
+/* tf_util.c */
+int tf_save_cred(char *, char *, char *, C_Block, int , int, KTEXT, long);
+
+/* unix_glue.c */
+int krb_start_session(char *);
+
+int krb_end_session(char *);
+
+char FAR *krb_get_default_user (void);
+
+int krb_set_default_user (char *);
+
+
+
diff --git a/src/lib/krb4/log.c b/src/lib/krb4/log.c
index 07e67288d5..24cf1b18d8 100644
--- a/src/lib/krb4/log.c
+++ b/src/lib/krb4/log.c
@@ -24,7 +24,7 @@
 #endif
 #include <stdio.h>
 
-#include "krb.h"
+#include "krb4int.h"
 #include <klog.h>
 
 static char *log_name = KRBLOG;
@@ -53,9 +53,6 @@ static is_open;
  * The return value is undefined.
  */
 
-/* should be in a header */
-char *month_sname();
-
 /*VARARGS1 */
 void krb_log(format,a1,a2,a3,a4,a5,a6,a7,a8,a9,a0)
     char *format;
diff --git a/src/lib/krb4/mk_req.c b/src/lib/krb4/mk_req.c
index cbb4dbd985..4f783fb995 100644
--- a/src/lib/krb4/mk_req.c
+++ b/src/lib/krb4/mk_req.c
@@ -29,6 +29,7 @@
 #include "prot.h"
 #include "des.h"
 #include <string.h>
+#include "krb4int.h"
 
 extern int krb_ap_req_debug;
 static int lifetime = 255;		/* Default based on the TGT */
diff --git a/src/lib/krb4/month_sname.c b/src/lib/krb4/month_sname.c
index 1d37098d6d..48be89e53a 100644
--- a/src/lib/krb4/month_sname.c
+++ b/src/lib/krb4/month_sname.c
@@ -14,6 +14,9 @@
  * month.  Returns 0 if the argument is out of range.
  */
 
+#include <krb.h>
+#include "krb4int.h"
+
 const char *month_sname(n)
     int n;
 {
diff --git a/src/lib/krb4/rd_preauth.c b/src/lib/krb4/rd_preauth.c
index a9c219215a..b30838cc4f 100644
--- a/src/lib/krb4/rd_preauth.c
+++ b/src/lib/krb4/rd_preauth.c
@@ -16,6 +16,7 @@
 #include "krb_db.h"
 #include "prot.h"
 #include "des.h"
+#include "krb4int.h"
 #include <string.h>
 
 /* #define      KERB_ERR_PREAUTH_SHORT		11 */
diff --git a/src/lib/krb4/sendauth.c b/src/lib/krb4/sendauth.c
index c8b6602d77..9baf27def6 100644
--- a/src/lib/krb4/sendauth.c
+++ b/src/lib/krb4/sendauth.c
@@ -12,6 +12,7 @@
 
 #define	DEFINE_SOCKADDR		/* Ask for sockets declarations from krb.h. */
 #include "krb.h"
+#include "krb4int.h"
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/lib/krb4/stime.c b/src/lib/krb4/stime.c
index 780455ce74..d1261acb8c 100644
--- a/src/lib/krb4/stime.c
+++ b/src/lib/krb4/stime.c
@@ -12,6 +12,7 @@
 #define	DEFINE_SOCKADDR
 #define NEED_TIME_H
 #include "krb.h"
+#include "krb4int.h"
 #include <stdio.h>                      /* for sprintf() */
 
 /*
@@ -28,7 +29,6 @@ char *krb_stime(t)
     static char st[40];
     static time_t adjusted_time;
     struct tm *tm;
-    char *month_sname();
 
     adjusted_time = *t - CONVERT_TIME_EPOCH;
     tm = localtime(&adjusted_time);
diff --git a/src/lib/krb4/unix_glue.c b/src/lib/krb4/unix_glue.c
index a05b0c05bf..a1120bb15f 100644
--- a/src/lib/krb4/unix_glue.c
+++ b/src/lib/krb4/unix_glue.c
@@ -9,6 +9,7 @@
 
 #include "krb.h"
 #include <sys/time.h>
+#include "krb4int.h"
 
 /* Start and end Kerberos library access.  On Unix, this is a No-op.  */
 int