* vfy_increds.c: include int-proto.h for krb5_libdefault_boolean

	prototype.

	* t_ser.c (ser_eblock_test): ifdef out old eblock serialization
	test which is no longer called. (see 1999-09-01 ChangeLog)

	* t_kerb.c: Cast argument to fprintf to long to agree with format
	string.

	* t_deltat.c: If MIN is defined, undef before redefined as 60.

	* str_conv.c: Provide strptime prototype if the system header
	files fail to provide a prototype.

	* int-proto.h:  Add prototype for krb5_libdefault_boolean()

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

7 files changed, 35 insertions, 2 deletions

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 2d4546f3a..e13fc341c 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,21 @@
+2000-07-18  Ezra Peisach  <epeisach@mit.edu>
+
+	* vfy_increds.c: include int-proto.h for krb5_libdefault_boolean
+	prototype.
+
+	* t_ser.c (ser_eblock_test): ifdef out old eblock serialization
+	test which is no longer called. (see 1999-09-01 ChangeLog)
+
+	* t_kerb.c: Cast argument to fprintf to long to agree with format
+	string.
+
+	* t_deltat.c: If MIN is defined, undef before redefined as 60.
+
+	* str_conv.c: Provide strptime prototype if the system header
+	files fail to provide a prototype.
+
+	* int-proto.h:  Add prototype for krb5_libdefault_boolean()
+
 2000-06-30  Tom Yu  <tlyu@mit.edu>
 
 	* conv_princ.c (krb5_425_conv_principal): NULL, not nil.
diff --git a/src/lib/krb5/krb/int-proto.h b/src/lib/krb5/krb/int-proto.h
index 53144b15d..264dcf3ac 100644
--- a/src/lib/krb5/krb/int-proto.h
+++ b/src/lib/krb5/krb/int-proto.h
@@ -37,5 +37,9 @@ krb5_error_code krb5_tgtname
 	           const krb5_data *,
 	           krb5_principal *));
 
+krb5_error_code krb5_libdefault_boolean
+        KRB5_PROTOTYPE((krb5_context, const krb5_data *, const char *,
+			int *));
+
 #endif /* KRB5_INT_FUNC_PROTO__ */
 
diff --git a/src/lib/krb5/krb/str_conv.c b/src/lib/krb5/krb/str_conv.c
index 38cef50e3..e795bd253 100644
--- a/src/lib/krb5/krb/str_conv.c
+++ b/src/lib/krb5/krb/str_conv.c
@@ -136,7 +136,12 @@ krb5_salttype_to_string(salttype, buffer, buflen)
 static size_t strftime (char *, size_t, const char *, const struct tm *);
 #endif
 
-#ifndef HAVE_STRPTIME
+#ifdef HAVE_STRPTIME
+#ifdef NEED_STRPTIME_PROTOTYPE
+extern char *strptime (const char *, const char *,
+			    struct tm *);
+#endif
+#else /* HAVE_STRPTIME */
 #undef strptime
 #define strptime my_strptime
 static char *strptime (const char *, const char *, struct tm *);
diff --git a/src/lib/krb5/krb/t_deltat.c b/src/lib/krb5/krb/t_deltat.c
index fc09c570b..3e376b10a 100644
--- a/src/lib/krb5/krb/t_deltat.c
+++ b/src/lib/krb5/krb/t_deltat.c
@@ -38,6 +38,9 @@ main ()
 #define BAD(STR) { STR, 0, 1 }
 #define DAY (24 * 3600)
 #define HOUR 3600
+#ifdef MIN
+#undef MIN
+#endif
 #define MIN 60
     } values[] = {
 	/* d-h-m-s patterns */
diff --git a/src/lib/krb5/krb/t_kerb.c b/src/lib/krb5/krb/t_kerb.c
index 458015d1c..a08ac6d5e 100644
--- a/src/lib/krb5/krb/t_kerb.c
+++ b/src/lib/krb5/krb/t_kerb.c
@@ -178,7 +178,7 @@ main(argc, argv)
     retval = krb5_init_context(&ctx);
     if (retval) {
 	fprintf(stderr, "krb5_init_context returned error %ld\n",
-		retval);
+		(long) retval);
 	exit(1);
     }
     progname = argv[0];
diff --git a/src/lib/krb5/krb/t_ser.c b/src/lib/krb5/krb/t_ser.c
index 19cff73c5..1592a89b4 100644
--- a/src/lib/krb5/krb/t_ser.c
+++ b/src/lib/krb5/krb/t_ser.c
@@ -512,6 +512,7 @@ ser_rcache_test(kcontext, verbose)
     return(kret);
 }
 
+#if 0
 /*
  * Serialize krb5_encrypt_block.
  */
@@ -563,6 +564,7 @@ ser_eblock_test(kcontext, verbose)
 	printf("* eblock test failed\n");
     return(kret);
 }
+#endif
 
 /*
  * Serialize krb5_principal
diff --git a/src/lib/krb5/krb/vfy_increds.c b/src/lib/krb5/krb/vfy_increds.c
index d3389b81a..e3955174e 100644
--- a/src/lib/krb5/krb/vfy_increds.c
+++ b/src/lib/krb5/krb/vfy_increds.c
@@ -1,4 +1,5 @@
 #include "k5-int.h"
+#include "int-proto.h"
 
 static krb5_error_code
 krb5_cc_copy_creds_except(context, incc, outcc, princ)