2 files changed, 28 insertions, 19 deletions

diff --git a/kerberos5/include/config.h b/kerberos5/include/config.h
index caeca1665c1d..05a13d0ce1af 100644
--- a/kerberos5/include/config.h
+++ b/kerberos5/include/config.h
@@ -91,11 +91,17 @@
 /* Define if you have the <bsdsetjmp.h> header file. */
 /* #undef HAVE_BSDSETJMP_H */
 
+/* Define if you have the `bswap16' function. */
+/* #undef HAVE_BSWAP16 */
+
+/* Define if you have the `bswap32' function. */
+/* #undef HAVE_BSWAP32 */
+
 /* Define if you have the <capability.h> header file. */
 /* #undef HAVE_CAPABILITY_H */
 
 /* Define if you have the `cap_set_proc' function. */
-/* #undef HAVE_CAP_SET_PROC */
+#define HAVE_CAP_SET_PROC 1
 
 /* Define if you have the `cgetent' function. */
 #define HAVE_CGETENT 1
@@ -259,6 +265,9 @@
 /* Define if you have the `getopt' function. */
 #define HAVE_GETOPT 1
 
+/* Define if you have the `getprogname' function. */
+#define HAVE_GETPROGNAME 1
+
 /* Define if you have the `getpwnam_r' function. */
 /* #undef HAVE_GETPWNAM_R */
 
@@ -284,7 +293,7 @@
 #define HAVE_GETUSERSHELL 1
 
 /* define if you have a glob() that groks GLOB_BRACE, GLOB_NOCHECK,
-   GLOB_QUOTE, and GLOB_TILDE */
+   GLOB_QUOTE, GLOB_TILDE, and GLOB_LIMIT */
 #define HAVE_GLOB 1
 
 /* Define if you have the `grantpt' function. */
@@ -329,6 +338,9 @@
 /* Define if you have the `initgroups' function. */
 #define HAVE_INITGROUPS 1
 
+/* Define if you have the `initstate' function. */
+#define HAVE_INITSTATE 1
+
 /* Define if you have the `innetgr' function. */
 #define HAVE_INNETGR 1
 
@@ -377,9 +389,6 @@
 /* Define if you have the `memmove' function. */
 #define HAVE_MEMMOVE 1
 
-/* Define if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
 /* Define if you have the `mkstemp' function. */
 #define HAVE_MKSTEMP 1
 
@@ -557,6 +566,9 @@
 /* Define if you have the `setproctitle' function. */
 #define HAVE_SETPROCTITLE 1
 
+/* Define if you have the `setprogname' function. */
+#define HAVE_SETPROGNAME 1
+
 /* Define if you have the `setregid' function. */
 #define HAVE_SETREGID 1
 
@@ -575,6 +587,9 @@
 /* Define if you have the `setsockopt' function. */
 #define HAVE_SETSOCKOPT 1
 
+/* Define if you have the `setstate' function. */
+#define HAVE_SETSTATE 1
+
 /* Define if you have the `setutent' function. */
 /* #undef HAVE_SETUTENT */
 
@@ -611,9 +626,6 @@
 /* Define if you have the <standards.h> header file. */
 /* #undef HAVE_STANDARDS_H */
 
-/* Define if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
 /* Define if you have the `strcasecmp' function. */
 #define HAVE_STRCASECMP 1
 
@@ -626,12 +638,6 @@
 /* Define if you have the `strftime' function. */
 #define HAVE_STRFTIME 1
 
-/* Define if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
 /* Define if you have the `strlcat' function. */
 #define HAVE_STRLCAT 1
 
@@ -755,6 +761,9 @@
 /* Define if you have the <sys/bitypes.h> header file. */
 /* #undef HAVE_SYS_BITYPES_H */
 
+/* Define if you have the <sys/bswap.h> header file. */
+/* #undef HAVE_SYS_BSWAP_H */
+
 /* Define if you have the <sys/capability.h> header file. */
 #define HAVE_SYS_CAPABILITY_H 1
 
@@ -1117,7 +1126,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "0.3e"
+#define VERSION "0.3f"
 
 /* Define if signal handlers return void. */
 #define VOID_RETSIGTYPE 1
diff --git a/kerberos5/include/version.h b/kerberos5/include/version.h
index 26fc6c845f94..09f2fba711d8 100644
--- a/kerberos5/include/version.h
+++ b/kerberos5/include/version.h
@@ -1,5 +1,5 @@
 /* $FreeBSD$ */
-char *krb4_long_version = "@(#)$Version: krb4-1.0.5 (FreeBSD) $";
-char *krb4_version = "krb4-1.0.5";
-const char *heimdal_long_version = "@(#)$Version: heimdal-0.3e (FreeBSD) $";
-const char *heimdal_version = "heimdal-0.3e";
+const char *krb4_long_version = "@(#)$Version: krb4-1.0.5 (FreeBSD) $";
+const char *krb4_version = "krb4-1.0.5";
+const char *heimdal_long_version = "@(#)$Version: heimdal-0.3f (FreeBSD) $";
+const char *heimdal_version = "heimdal-0.3f";