From 0d66561a0b21572676ee1729a6e925d2f491ab6f Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@stanford.edu>
Date: Wed, 26 May 2010 22:04:48 -0500
Subject: [PATCH] Fix compilation of the imported config_file.c parser

Include additional missing header files for proper function prototypes,
define TRUE and FALSE, and declare krb5_clear_error_message as unused
so that the config_file.c will compile and pass --enable-checking.

Make the build depend on krb5_locl.h.

Change-Id: I25a35098aa81c9d2a0efea48257dcb958602c785
Reviewed-on: http://gerrit.openafs.org/2040
Tested-by: Russ Allbery <rra@stanford.edu>
Reviewed-by: Marc Dionne <marc.c.dionne@gmail.com>
Tested-by: Marc Dionne <marc.c.dionne@gmail.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---
 src/util/Makefile.in |  2 +-
 src/util/krb5_locl.h | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 82ba680fb..3eda416b4 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -156,7 +156,7 @@ fstab.o: ${srcdir}/fstab.c ${includes}
 base64.o: ${srcdir}/base64.c ${includes}
 	${CCOBJ} ${CFLAGS} -c ${srcdir}/base64.c
 
-config_file.o : ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c
+config_file.o: ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c krb5_locl.h
 	${CCOBJ} ${CFLAGS} -c ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c
 
 hostparse.o: ${srcdir}/hostparse.c ${includes}
diff --git a/src/util/krb5_locl.h b/src/util/krb5_locl.h
index f6fde3ab7..a85801b0f 100644
--- a/src/util/krb5_locl.h
+++ b/src/util/krb5_locl.h
@@ -7,14 +7,24 @@
 #include <afsconfig.h>
 #include <afs/stds.h>
 
-#include <time.h>
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <pwd.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <string.h>
 #include <sys/types.h>
-#include <pwd.h>
-#include <assert.h>
+#include <time.h>
+#include <unistd.h>
+
+#ifndef TRUE
+# define TRUE 1
+#endif
+#ifndef FALSE
+# define FALSE 0
+#endif
 
 #define KRB5_LIB_FUNCTION static AFS_UNUSED
 #define KRB5_LIB_CALL
@@ -77,7 +87,7 @@ krb5_string_to_deltat(const char *str, krb5_deltat *t) {
     return 1;
 }
 
-static void krb5_clear_error_message(krb5_context context) {
+KRB5_LIB_FUNCTION void krb5_clear_error_message(krb5_context context) {
     return;
 }
 
-- 
2.39.5