Merge with heimdal-0.6.3 Tested by beck@, msf@, me and others. ok beck@

5 files changed, 19 insertions, 10 deletions

diff --git a/kerberosV/include/config.h b/kerberosV/include/config.h
index 0b6ac61f4e3..33a26d7b6bc 100644
--- a/kerberosV/include/config.h
+++ b/kerberosV/include/config.h
@@ -161,6 +161,9 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 /* Define if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
+/* Define to 1 if you have the `dlopen' function. */
+/* #undef HAVE_DLOPEN 1 */
+
 /* Define if you have the `dn_expand' function. */
 #define HAVE_DN_EXPAND 1
 
@@ -1014,6 +1017,12 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 /* Define if you have the `_getpty' function. */
 /* #undef HAVE__GETPTY */
 
+/* Define if you have the `_res' variable. */
+#define HAVE__RES 1
+
+/* define if your system declares _res */
+#define HAVE__RES_DECLARATION 1
+
 /* Define if you have the `_scrsize' function. */
 /* #undef HAVE__SCRSIZE */
 
@@ -1036,7 +1045,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 #define KRB5 1
 
 /* Define if krb_mk_req takes cons char * */
-#define KRB_MK_REQ_CONST
+/* #undef KRB_MK_REQ_CONST */
 
 /* Define to zero if your krb.h doesn't */
 /* #undef KRB_VERIFY_NOT_SECURE */
@@ -1142,7 +1151,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "0.6RC1"
+#define VERSION "0.6.3"
 
 /* Define if signal handlers return void. */
 #define VOID_RETSIGTYPE 1
diff --git a/kerberosV/include/print_version.h b/kerberosV/include/print_version.h
index c49269d3a00..052da488eb0 100644
--- a/kerberosV/include/print_version.h
+++ b/kerberosV/include/print_version.h
@@ -1 +1 @@
-#define VERSIONLIST { "heimdal-0.6RC1/OpenBSD", }
+#define VERSIONLIST { "heimdal-0.6.3/OpenBSD", }
diff --git a/kerberosV/include/roken.h b/kerberosV/include/roken.h
index 8415e4f7f08..9b53b812686 100644
--- a/kerberosV/include/roken.h
+++ b/kerberosV/include/roken.h
@@ -39,7 +39,7 @@
  */
 
 /* $KTH: roken.h.in,v 1.159 2001/08/21 15:32:05 assar Exp $ */
-/* $Id: roken.h,v 1.9 2003/05/12 00:00:38 hin Exp $ */
+/* $Id: roken.h,v 1.10 2004/10/29 16:25:42 biorn Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -228,6 +228,6 @@ void set_progname(char *argv0);
 const char *get_progname(void);
 
 ROKEN_CPP_END
-#define ROKEN_VERSION 0.6RC1
+#define ROKEN_VERSION 0.6.3
 
 #endif /* __ROKEN_H__ */
diff --git a/kerberosV/include/version.h b/kerberosV/include/version.h
index 19570ec5f82..e4785b9068a 100644
--- a/kerberosV/include/version.h
+++ b/kerberosV/include/version.h
@@ -1,2 +1,2 @@
-char *heimdal_long_version = "@(#)$Version: heimdal-0.6RC1/OpenBSD";
-char *heimdal_version = "heimdal-0.6RC1/OpenBSD";
+char *heimdal_long_version = "@(#)$Version: heimdal-0.6.3/OpenBSD";
+char *heimdal_version = "heimdal-0.6.3/OpenBSD";
diff --git a/kerberosV/openbsd-vers/print_version.c b/kerberosV/openbsd-vers/print_version.c
index 72c4e2bf8d0..abe56e87651 100644
--- a/kerberosV/openbsd-vers/print_version.c
+++ b/kerberosV/openbsd-vers/print_version.c
@@ -32,13 +32,13 @@
  */
 
 #if 0
-RCSID("$Id: print_version.c,v 1.1 2003/05/18 07:51:42 mho Exp $");
+RCSID("$Id: print_version.c,v 1.2 2004/10/29 16:25:46 biorn Exp $");
 #endif
 
 #include <stdio.h>
 
 
-#define VERSIONLIST 		{ "heimdal-0.6RC1/OpenBSD", }
+#define VERSIONLIST 		{ "heimdal-0.6.3/OpenBSD", }
 #define PACKAGE_BUGREPORT	"bugs@openbsd.org"
 
 char *__progname;
@@ -54,6 +54,6 @@ print_version(const char *progname)
     if(*package_list == '\0')
 	package_list = "no version information";
     fprintf(stderr, "%s (%s)\n", progname, package_list);
-    fprintf(stderr, "Copyright 1999-2003 Kungliga Tekniska Högskolan\n");
+    fprintf(stderr, "Copyright 1999-2004 Kungliga Tekniska Högskolan\n");
     fprintf(stderr, "Send bug-reports to %s\n", PACKAGE_BUGREPORT);
 }