Index: heimdal-0.7.2/appl/kf/kf_locl.h
===================================================================
--- heimdal-0.7.2.orig/appl/kf/kf_locl.h	2002-09-05 06:29:04.000000000 +1000
+++ heimdal-0.7.2/appl/kf/kf_locl.h	2006-03-09 12:59:30.120809192 +1100
@@ -79,3 +79,7 @@
 #define KF_PORT_NAME		"kf"
 #define KF_PORT_NUM		2110
 #define KF_VERSION_1		"KFWDV0.1"
+
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
Index: heimdal-0.7.2/appl/kf/kfd.c
===================================================================
--- heimdal-0.7.2.orig/appl/kf/kfd.c	2005-05-27 23:43:24.000000000 +1000
+++ heimdal-0.7.2/appl/kf/kfd.c	2006-03-09 12:59:30.121809040 +1100
@@ -128,7 +128,7 @@
     krb5_ticket *ticket;
     char *name;
     char ret_string[10];
-    char hostname[MAXHOSTNAMELEN];
+    char hostname[MaxHostNameLen];
     krb5_data data;
     krb5_data remotename;
     krb5_data tk_file;
Index: heimdal-0.7.2/appl/kx/kx.h
===================================================================
--- heimdal-0.7.2.orig/appl/kx/kx.h	2003-04-17 02:45:43.000000000 +1000
+++ heimdal-0.7.2/appl/kx/kx.h	2006-03-09 12:59:30.122808888 +1100
@@ -107,6 +107,10 @@
 #include <sys/stropts.h>
 #endif
 
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
+
 /* defined by aix's sys/stream.h and again by arpa/nameser.h */
 
 #undef NOERROR
Index: heimdal-0.7.2/appl/login/login_access.c
===================================================================
--- heimdal-0.7.2.orig/appl/login/login_access.c	2001-06-05 00:09:45.000000000 +1000
+++ heimdal-0.7.2/appl/login/login_access.c	2006-03-09 12:59:30.123808736 +1100
@@ -163,11 +163,11 @@
 
 static char *myhostname(void)
 {
-    static char name[MAXHOSTNAMELEN + 1] = "";
+    static char name[MaxHostNameLen + 1] = "";
 
     if (name[0] == 0) {
 	gethostname(name, sizeof(name));
-	name[MAXHOSTNAMELEN] = 0;
+	name[MaxHostNameLen] = 0;
     }
     return (name);
 }
Index: heimdal-0.7.2/appl/login/login_locl.h
===================================================================
--- heimdal-0.7.2.orig/appl/login/login_locl.h	2005-04-23 01:38:54.000000000 +1000
+++ heimdal-0.7.2/appl/login/login_locl.h	2006-03-09 12:59:30.124808584 +1100
@@ -150,6 +150,10 @@
 #endif
 
 
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
+
 struct spwd;
 
 extern char **env;
Index: heimdal-0.7.2/appl/popper/popper.h
===================================================================
--- heimdal-0.7.2.orig/appl/popper/popper.h	2004-07-14 19:10:30.000000000 +1000
+++ heimdal-0.7.2/appl/popper/popper.h	2006-03-09 12:59:30.125808432 +1100
@@ -154,6 +154,10 @@
 #define POP_MAILDIR	"/usr/spool/mail"
 #endif
 
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
+
 #define POP_DROP        POP_MAILDIR "/.%s.pop"
 	/* POP_TMPSIZE needs to be big enough to hold the string
 	 * defined by POP_TMPDROP.  POP_DROP and POP_TMPDROP
Index: heimdal-0.7.2/appl/rcp/rcp_locl.h
===================================================================
--- heimdal-0.7.2.orig/appl/rcp/rcp_locl.h	2005-05-30 04:24:43.000000000 +1000
+++ heimdal-0.7.2/appl/rcp/rcp_locl.h	2006-03-09 12:59:30.125808432 +1100
@@ -65,3 +65,7 @@
 #endif
 #undef _PATH_RSH
 #define	_PATH_RSH	BINDIR "/rsh"
+
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
Index: heimdal-0.7.2/appl/rsh/rsh_locl.h
===================================================================
--- heimdal-0.7.2.orig/appl/rsh/rsh_locl.h	2005-12-29 05:00:05.000000000 +1100
+++ heimdal-0.7.2/appl/rsh/rsh_locl.h	2006-03-09 12:59:30.126808280 +1100
@@ -172,3 +172,7 @@
 #define do_write(F, B, L, I) write((F), (B), (L))
 #define do_read(F, B, L, I) read((F), (B), (L))
 #endif
+
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
Index: heimdal-0.7.2/appl/test/tcp_server.c
===================================================================
--- heimdal-0.7.2.orig/appl/test/tcp_server.c	1999-12-16 21:31:08.000000000 +1100
+++ heimdal-0.7.2/appl/test/tcp_server.c	2006-03-09 12:59:30.127808128 +1100
@@ -44,7 +44,7 @@
     krb5_principal server;
     krb5_ticket *ticket;
     char *name;
-    char hostname[MAXHOSTNAMELEN];
+    char hostname[MaxHostNameLen];
     krb5_data packet;
     krb5_data data;
     u_int32_t len, net_len;
Index: heimdal-0.7.2/lib/gssapi/gssapi_locl.h
===================================================================
--- heimdal-0.7.2.orig/lib/gssapi/gssapi_locl.h	2005-05-31 06:53:46.000000000 +1000
+++ heimdal-0.7.2/lib/gssapi/gssapi_locl.h	2006-03-09 12:59:30.128807976 +1100
@@ -84,6 +84,10 @@
  *
  */
 
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
+
 extern krb5_context gssapi_krb5_context;
 
 extern krb5_keytab gssapi_krb5_keytab;
Index: heimdal-0.7.2/lib/gssapi/import_name.c
===================================================================
--- heimdal-0.7.2.orig/lib/gssapi/import_name.c	2003-03-17 04:33:31.000000000 +1100
+++ heimdal-0.7.2/lib/gssapi/import_name.c	2006-03-09 12:59:30.129807824 +1100
@@ -90,7 +90,7 @@
     char *tmp;
     char *p;
     char *host;
-    char local_hostname[MAXHOSTNAMELEN];
+    char local_hostname[MaxHostNameLen];
 
     *output_name = NULL;
 
Index: heimdal-0.7.2/lib/kdfs/k5dfspag.c
===================================================================
--- heimdal-0.7.2.orig/lib/kdfs/k5dfspag.c	2002-08-13 01:11:58.000000000 +1000
+++ heimdal-0.7.2/lib/kdfs/k5dfspag.c	2006-03-09 12:59:30.130807672 +1100
@@ -78,6 +78,9 @@
 #define WAIT_USES_INT
 typedef krb5_sigtype sigtype;
 
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
 
 /* 
  * Need some syscall numbers based on different systems. 
Index: heimdal-0.7.2/lib/krb5/get_addrs.c
===================================================================
--- heimdal-0.7.2.orig/lib/krb5/get_addrs.c	2004-05-26 07:26:05.000000000 +1000
+++ heimdal-0.7.2/lib/krb5/get_addrs.c	2006-03-09 12:59:30.139806304 +1100
@@ -49,7 +49,7 @@
 gethostname_fallback (krb5_context context, krb5_addresses *res)
 {
     krb5_error_code ret;
-    char hostname[MAXHOSTNAMELEN];
+    char hostname[MaxHostNameLen];
     struct hostent *hostent;
 
     if (gethostname (hostname, sizeof(hostname))) {
Index: heimdal-0.7.2/lib/krb5/get_host_realm.c
===================================================================
--- heimdal-0.7.2.orig/lib/krb5/get_host_realm.c	2005-04-20 04:52:51.000000000 +1000
+++ heimdal-0.7.2/lib/krb5/get_host_realm.c	2006-03-09 12:59:30.140806152 +1100
@@ -95,7 +95,7 @@
 	       krb5_realm **realms)
 {
     static char *default_labels[] = { "_kerberos", NULL };
-    char dom[MAXHOSTNAMELEN];
+    char dom[MaxHostNameLen];
     struct dns_reply *r;
     char **labels;
     int i, ret;
@@ -208,7 +208,7 @@
 		    const char *host,
 		    krb5_realm **realms)
 {
-    char hostname[MAXHOSTNAMELEN];
+    char hostname[MaxHostNameLen];
 
     if (host == NULL) {
 	if (gethostname (hostname, sizeof(hostname)))
Index: heimdal-0.7.2/lib/krb5/krbhst-test.c
===================================================================
--- heimdal-0.7.2.orig/lib/krb5/krbhst-test.c	2002-08-23 13:43:18.000000000 +1000
+++ heimdal-0.7.2/lib/krb5/krbhst-test.c	2006-03-09 12:59:30.140806152 +1100
@@ -87,7 +87,7 @@
     krb5_init_context (&context);
     for(i = 0; i < argc; i++) {
 	krb5_krbhst_handle handle;
-	char host[MAXHOSTNAMELEN];
+	char host[MaxHostNameLen];
 
 	for (j = 0; j < sizeof(types)/sizeof(*types); ++j) {
 	    printf ("%s for %s:\n", type_str[j], argv[i]);
Index: heimdal-0.7.2/lib/krb5/krbhst.c
===================================================================
--- heimdal-0.7.2.orig/lib/krb5/krbhst.c	2005-05-20 19:09:42.000000000 +1000
+++ heimdal-0.7.2/lib/krb5/krbhst.c	2006-03-09 12:59:30.142805848 +1100
@@ -763,7 +763,7 @@
     krb5_error_code ret;
     int nhost = 0;
     krb5_krbhst_handle handle;
-    char host[MAXHOSTNAMELEN];
+    char host[MaxHostNameLen];
     krb5_krbhst_info *hostinfo;
 
     ret = krb5_krbhst_init(context, realm, type, &handle);
Index: heimdal-0.7.2/lib/krb5/principal.c
===================================================================
--- heimdal-0.7.2.orig/lib/krb5/principal.c	2004-12-29 12:54:54.000000000 +1100
+++ heimdal-0.7.2/lib/krb5/principal.c	2006-03-09 12:59:30.150804632 +1100
@@ -706,8 +706,8 @@
     const char *p;
     krb5_error_code ret;
     krb5_principal pr;
-    char host[MAXHOSTNAMELEN];
-    char local_hostname[MAXHOSTNAMELEN];
+    char host[MaxHostNameLen];
+    char local_hostname[MaxHostNameLen];
 
     /* do the following: if the name is found in the
        `v4_name_convert:host' part, is is assumed to be a `host' type
@@ -1059,7 +1059,7 @@
 			 krb5_principal *ret_princ)
 {
     krb5_error_code ret;
-    char localhost[MAXHOSTNAMELEN];
+    char localhost[MaxHostNameLen];
     char **realms, *host = NULL;
 	
     if(type != KRB5_NT_SRV_HST && type != KRB5_NT_UNKNOWN) {
Index: heimdal-0.7.2/lib/krb5/verify_init.c
===================================================================
--- heimdal-0.7.2.orig/lib/krb5/verify_init.c	2004-05-26 07:45:47.000000000 +1000
+++ heimdal-0.7.2/lib/krb5/verify_init.c	2006-03-09 12:59:30.151804480 +1100
@@ -90,7 +90,7 @@
     memset (&entry, 0, sizeof(entry));
 
     if (ap_req_server == NULL) {
-	char local_hostname[MAXHOSTNAMELEN];
+	char local_hostname[MaxHostNameLen];
 
 	if (gethostname (local_hostname, sizeof(local_hostname)) < 0) {
 	    ret = errno;
Index: heimdal-0.7.2/lib/roken/getaddrinfo_hostspec.c
===================================================================
--- heimdal-0.7.2.orig/lib/roken/getaddrinfo_hostspec.c	2005-04-12 21:28:43.000000000 +1000
+++ heimdal-0.7.2/lib/roken/getaddrinfo_hostspec.c	2006-03-09 12:59:30.152804328 +1100
@@ -48,7 +48,7 @@
 {
     const char *p;
     char portstr[NI_MAXSERV];
-    char host[MAXHOSTNAMELEN];
+    char host[MaxHostNameLen];
     struct addrinfo hints;
     int hostspec_len;
 
Index: heimdal-0.7.2/lib/sl/slc-gram.y
===================================================================
--- heimdal-0.7.2.orig/lib/sl/slc-gram.y	2005-04-19 20:28:28.000000000 +1000
+++ heimdal-0.7.2/lib/sl/slc-gram.y	2006-03-09 12:59:30.153804176 +1100
@@ -46,6 +46,10 @@
 #include <vers.h>
 #include <roken.h>
 
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
 #include "slc.h"
 extern FILE *yyin;
 extern struct assignment *a;