Bug#483281: heimdal: FTBFS on hurd-i386

2011-02-23 Thread Samuel Thibault 
Hello,

Pino's patches are still applying fine to the sid package, and make the
package build on hurd-i386. Could you please apply them?

Thanks,
Samuel



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#483281: heimdal: FTBFS on hurd-i386

2011-02-23 Thread Pino Toscano 
Hi,

Alle mercoledì 23 febbraio 2011, Samuel Thibault ha scritto:
 Pino's patches are still applying fine to the sid package, and make
 the package build on hurd-i386. Could you please apply them?

There was just a bug in one of the patches (042). Attachking again all 
the patched, incuding the fixed one.

Thanks,
-- 
Pino Toscano
--- a/cf/pthreads.m4
+++ b/cf/pthreads.m4
@@ -42,6 +42,11 @@
 	PTHREADS_CFLAGS=-pthread
 	PTHREAD_LIBADD=-pthread
 	;;
+*-*-gnu*)
+	native_pthread_support=yes
+	PTHREADS_CFLAGS=-pthread
+	PTHREAD_LIBADD=-pthread -lpthread
+	;;
 *-*-linux* | *-*-linux-gnu)
 	case `uname -r` in
 	2.*)
--- a/lib/roken/getaddrinfo_hostspec.c
+++ b/lib/roken/getaddrinfo_hostspec.c
@@ -45,7 +45,7 @@
 {
 const char *p;
 char portstr[NI_MAXSERV];
-char host[MAXHOSTNAMELEN];
+char host[MaxHostNameLen];
 struct addrinfo hints;
 int hostspec_len;
 
--- a/lib/krb5/get_addrs.c
+++ b/lib/krb5/get_addrs.c
@@ -47,7 +47,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))) {
--- a/lib/krb5/get_host_realm.c
+++ b/lib/krb5/get_host_realm.c
@@ -93,7 +93,7 @@
 	   krb5_realm **realms)
 {
 static const char *default_labels[] = { _kerberos, NULL };
-char dom[MAXHOSTNAMELEN];
+char dom[MaxHostNameLen];
 struct rk_dns_reply *r;
 const char **labels;
 char **config_labels;
@@ -221,7 +221,7 @@
 		krb5_realm **realms)
 {
 const char *host = targethost;
-char hostname[MAXHOSTNAMELEN];
+char hostname[MaxHostNameLen];
 krb5_error_code ret;
 int use_dns;
 
--- a/lib/krb5/krbhst.c
+++ b/lib/krb5/krbhst.c
@@ -982,7 +982,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);
--- a/lib/krb5/principal.c
+++ b/lib/krb5/principal.c
@@ -1096,8 +1096,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 assumed to be a `host' type
@@ -1468,7 +1468,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) {
--- a/lib/krb5/verify_init.c
+++ b/lib/krb5/verify_init.c
@@ -86,7 +86,7 @@
 krb5_data_zero (req);
 
 if (ap_req_server == NULL) {
-	char local_hostname[MAXHOSTNAMELEN];
+	char local_hostname[MaxHostNameLen];
 
 	if (gethostname (local_hostname, sizeof(local_hostname))  0) {
 	ret = errno;
--- a/lib/krb5/krbhst-test.c
+++ b/lib/krb5/krbhst-test.c
@@ -85,7 +85,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]);
--- a/lib/gssapi/spnego/accept_sec_context.c
+++ b/lib/gssapi/spnego/accept_sec_context.c
@@ -364,7 +364,7 @@
 if (verify_p) {
 	gss_name_t name = GSS_C_NO_NAME;
 	gss_buffer_desc namebuf;
-	char *str = NULL, *host, hostname[MAXHOSTNAMELEN];
+	char *str = NULL, *host, hostname[MaxHostNameLen];
 
 	host = getenv(GSSAPI_SPNEGO_NAME);
 	if (host == NULL || issuid()) {
--- a/appl/login/login_access.c
+++ b/appl/login/login_access.c
@@ -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);
 }
--- a/appl/gssmask/gssmask.c
+++ b/appl/gssmask/gssmask.c
@@ -55,7 +55,7 @@
 struct handle *handles;
 struct sockaddr_storage sa;
 socklen_t salen;
-char servername[MAXHOSTNAMELEN];
+char servername[MaxHostNameLen];
 };
 
 FILE *logfile;
@@ -1109,7 +1109,7 @@
 if (moniker) {
 	c-moniker = estrdup(moniker);
 } else {
-	char hostname[MAXHOSTNAMELEN];
+	char hostname[MaxHostNameLen];
 	gethostname(hostname, sizeof(hostname));
 	asprintf(c-moniker, gssmask: %s:%d, hostname, port);
 }
--- a/appl/test/tcp_server.c
+++ b/appl/test/tcp_server.c
@@ -44,7 +44,7 @@
 krb5_principal server;
 krb5_ticket *ticket;
 char *name;
-char hostname[MAXHOSTNAMELEN];
+char hostname[MaxHostNameLen];
 krb5_data packet;
 krb5_data data;
 uint32_t len, net_len;
--- a/appl/kf/kfd.c
+++ b/appl/kf/kfd.c
@@ -128,7 +128,7 @@
 krb5_ticket *ticket;
 char *name;

Bug#483281: heimdal: FTBFS on hurd-i386

2011-02-23 Thread Samuel Thibault 
Pino Toscano, le Wed 23 Feb 2011 22:36:19 +0100, a écrit :
 Alle mercoledì 23 febbraio 2011, Samuel Thibault ha scritto:
  Pino's patches are still applying fine to the sid package, and make
  the package build on hurd-i386. Could you please apply them?
 
 There was just a bug in one of the patches (042). Attachking again all 
 the patched, incuding the fixed one.

The patch series works on experimental too, except one of the hooks in
041_hurd_maxhostnamelen, the first of lib/krb5/principal.c, which can
simply be dropped from the patch.

Samuel



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#483281: heimdal: FTBFS on hurd-i386

2010-07-03 Thread Pino Toscano 
found 483281 1.4.0~git20100605.dfsg.1-3
tag 483281 + patch
thanks

Alle giovedì 17 giugno 2010, Brian May ha scritto:
  I suspect these patches may need revising to work with the latest
  version of Heimdal.
  
  Are changes to required to get Heimdal to build on hurd-i386?

Yes, most of the previous issues are still valid with the heimdal 
currently in unstable (1.4.0~git20100605.dfsg.1-3).
Here there are the needed patches, grouped by issue and named/numbered:

040_hurd_pthread:
  properly activate the pthread support, like Samuel said:
  cf/pthreads.m4 doesn't handle the *-*-gnu* case, third patch attached
  (configure has to be regenerated of course)

041_hurd_maxhostnamelen:
  deals with the various occurrences of MAXHOSTNAMELEN found, replacing
  them with MaxHostNameLen

042_hurd_path_max:
  PATH_MAX is not POSIX and not defined on Hurd. I did a bit of changes
  to the code to not rely on a static maximum length or filenames;
  if it does not look safe, just defining
#ifndef PATH_MAX
#define PATH_MAX 1024
#endif
  prior to the PATH_MAX usage

043_hurd_ioctl:
  as Samuel said:
  kafs now defines two ioctls, so it has to define the GNU _IOT
  constant

Thanks,
-- 
Pino Toscano
--- a/cf/pthreads.m4
+++ b/cf/pthreads.m4
@@ -42,6 +42,11 @@
 	PTHREADS_CFLAGS=-pthread
 	PTHREAD_LIBADD=-pthread
 	;;
+*-*-gnu*)
+	native_pthread_support=yes
+	PTHREADS_CFLAGS=-pthread
+	PTHREAD_LIBADD=-pthread -lpthread
+	;;
 *-*-linux* | *-*-linux-gnu)
 	case `uname -r` in
 	2.*)
--- a/lib/roken/getaddrinfo_hostspec.c
+++ b/lib/roken/getaddrinfo_hostspec.c
@@ -45,7 +45,7 @@
 {
 const char *p;
 char portstr[NI_MAXSERV];
-char host[MAXHOSTNAMELEN];
+char host[MaxHostNameLen];
 struct addrinfo hints;
 int hostspec_len;
 
--- a/lib/krb5/get_addrs.c
+++ b/lib/krb5/get_addrs.c
@@ -47,7 +47,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))) {
--- a/lib/krb5/get_host_realm.c
+++ b/lib/krb5/get_host_realm.c
@@ -93,7 +93,7 @@
 	   krb5_realm **realms)
 {
 static const char *default_labels[] = { _kerberos, NULL };
-char dom[MAXHOSTNAMELEN];
+char dom[MaxHostNameLen];
 struct rk_dns_reply *r;
 const char **labels;
 char **config_labels;
@@ -221,7 +221,7 @@
 		krb5_realm **realms)
 {
 const char *host = targethost;
-char hostname[MAXHOSTNAMELEN];
+char hostname[MaxHostNameLen];
 krb5_error_code ret;
 int use_dns;
 
--- a/lib/krb5/krbhst.c
+++ b/lib/krb5/krbhst.c
@@ -982,7 +982,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);
--- a/lib/krb5/principal.c
+++ b/lib/krb5/principal.c
@@ -1096,8 +1096,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 assumed to be a `host' type
@@ -1468,7 +1468,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) {
--- a/lib/krb5/verify_init.c
+++ b/lib/krb5/verify_init.c
@@ -86,7 +86,7 @@
 krb5_data_zero (req);
 
 if (ap_req_server == NULL) {
-	char local_hostname[MAXHOSTNAMELEN];
+	char local_hostname[MaxHostNameLen];
 
 	if (gethostname (local_hostname, sizeof(local_hostname))  0) {
 	ret = errno;
--- a/lib/krb5/krbhst-test.c
+++ b/lib/krb5/krbhst-test.c
@@ -85,7 +85,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]);
--- a/lib/gssapi/spnego/accept_sec_context.c
+++ b/lib/gssapi/spnego/accept_sec_context.c
@@ -364,7 +364,7 @@
 if (verify_p) {
 	gss_name_t name = GSS_C_NO_NAME;
 	gss_buffer_desc namebuf;
-	char *str = NULL, *host, hostname[MAXHOSTNAMELEN];
+	char *str = NULL, *host, hostname[MaxHostNameLen];
 
 	host = getenv(GSSAPI_SPNEGO_NAME);
 	if (host == NULL || issuid()) {
--- a/appl/login/login_access.c
+++ b/appl/login/login_access.c
@@ -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);
 }
--- a/appl/gssmask/gssmask.c
+++

Bug#483281: heimdal: FTBFS on hurd-i386

2010-06-16 Thread Brian May 
Why isn't the BTS accepting my emails?

On 17 June 2010 15:45, Brian May br...@microcomaustralia.com.au wrote:
 I suspect these patches may need revising to work with the latest
 version of Heimdal.

 Are changes to required to get Heimdal to build on hurd-i386?
-- 
Brian May br...@microcomaustralia.com.au



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#483281: heimdal: FTBFS on hurd-i386

2009-01-31 Thread Samuel Thibault 
Hello,

Samuel Thibault, le Wed 28 May 2008 01:51:56 +0100, a écrit :
 heimdal currently FTBFS on hurd-i386 for two reasons:
 
 - kafs now defines two ioctls, so it has to define the GNU _IOT
   constant, please apply first attached patch.
 - some new occurrences of MAXHOSTNAMELEN appeared, please append the second
   attached patch to 026_posix_max.

Here are updated versions of the two patches.

In the meanwhile, a third reason appeared: cf/pthreads.m4 doesn't handle
the *-*-gnu* case, third patch attached (configure has to be regenerated
of course)

Samuel
--- heimdal-1.1/lib/kafs/kafs.h 2008-05-27 15:38:28.9 +
+++ heimdal-1.1-mine/lib/kafs/kafs.h2008-05-27 15:40:15.2 +
@@ -46,6 +46,9 @@
 #define AFSCALL_SETPAG 21
 
 #ifndef _VICEIOCTL
+#ifdef __GNU__
+#define _IOT_ViceIoctl _IOT(_IOTS(caddr_t), 2, _IOTS(short), 2, 0, 0)
+#endif
 #define _VICEIOCTL(id)  ((unsigned int ) _IOW('V', id, struct ViceIoctl))
 #define _AFSCIOCTL(id)  ((unsigned int ) _IOW('C', id, struct ViceIoctl))
 #endif /* _VICEIOCTL */
--- heimdal-1.1/lib/kafs/afssys.c   2008-01-24 13:11:45.78000 +
+++ heimdal-1.1-mine/lib/kafs/afssys.c  2008-05-27 17:18:11.54000 +
@@ -42,7 +42,10 @@
 unsigned long param1;
 unsigned long syscall;
 };
-#define VIOC_SYSCALL_PROC _IOW('C', 1, void *)
+#ifdef __GNU__
+#define _IOT_procdata _IOT(_IOTS(long), 5, 0, 0, 0, 0)
+#endif
+#define VIOC_SYSCALL_PROC _IOW('C', 1, struct procdata)
 
 struct devdata {
 unsigned long syscall;
@@ -54,6 +57,9 @@
 unsigned long param6;
 unsigned long retval;
 };
+#ifdef __GNU__
+#define _IOT_devdata _IOT(_IOTS(long), 8, 0, 0, 0, 0)
+#endif
 #ifdef _IOWR
 #define VIOC_SYSCALL_DEV _IOWR('C', 2, struct devdata)
 #define VIOC_SYSCALL_DEV_OPENAFS _IOWR('C', 1, struct devdata)
--- heimdal-1.1/lib/gssapi/krb5/import_name.c   2008-01-24 13:11:49.0 
+
+++ heimdal-1.1-mine/lib/gssapi/krb5/import_name.c  2008-05-27 
18:25:29.12000 +
@@ -93,7 +93,7 @@
 char *tmp;
 char *p;
 char *host;
-char local_hostname[MAXHOSTNAMELEN];
+char local_hostname[MaxHostNameLen];
 krb5_principal princ = NULL;
 
 tmp = malloc (input_name_buffer-length + 1);
--- heimdal-1.1/lib/gssapi/spnego/accept_sec_context.c  2008-01-24 
13:11:47.0 +
+++ heimdal-1.1-mine/lib/gssapi/spnego/accept_sec_context.c 2008-05-27 
18:45:52.85000 +
@@ -92,7 +92,7 @@
  gss_buffer_t output_token)
 {
 NegotiationTokenWin nt;
-char hostname[MAXHOSTNAMELEN + 1], *p;
+char hostname[MaxHostNameLen + 1], *p;
 gss_buffer_desc name_buf;
 gss_OID name_type;
 gss_name_t target_princ;
@@ -421,7 +421,7 @@
 if (verify_p) {
gss_name_t name = GSS_C_NO_NAME;
gss_buffer_desc namebuf;
-   char *str = NULL, *host, hostname[MAXHOSTNAMELEN];
+   char *str = NULL, *host, hostname[MaxHostNameLen];
 
host = getenv(GSSAPI_SPNEGO_NAME);
if (host == NULL || issuid()) {
--- heimdal-1.1/appl/gssmask/gssmask.c  2008-01-24 13:10:25.0 +
+++ heimdal-1.1-mine/appl/gssmask/gssmask.c 2008-05-27 19:20:22.85000 
+
@@ -55,7 +55,7 @@
 struct handle *handles;
 struct sockaddr_storage sa;
 socklen_t salen;
-char servername[MAXHOSTNAMELEN];
+char servername[MaxHostNameLen];
 };
 
 FILE *logfile;
@@ -929,7 +929,7 @@
 if (moniker) {
c-moniker = estrdup(moniker);
 } else {
-   char hostname[MAXHOSTNAMELEN];
+   char hostname[MaxHostNameLen];
gethostname(hostname, sizeof(hostname));
asprintf(c-moniker, gssmask: %s:%d, hostname, port);
 }
--- cf/pthreads.m4.orig 2009-01-31 12:56:51.697292000 +
+++ cf/pthreads.m4  2009-01-31 12:56:59.931116000 +
@@ -32,6 +32,11 @@
PTHREADS_CFLAGS=-pthread
PTHREADS_LIBS=-pthread
;;
+*-*-gnu*)
+   native_pthread_support=yes
+   PTHREADS_CFLAGS=-pthread
+   PTHREADS_LIBS=-pthread -lpthread
+   ;;
 *-*-linux* | *-*-linux-gnu)
case `uname -r` in
2.*)

Bug#483281: heimdal: FTBFS on hurd-i386

2008-05-27 Thread Samuel Thibault 
Package: heimdal
Version: 1.1-3
Severity: important
Tags: patch
User: [EMAIL PROTECTED]
Usertags: hurd

Hello,

heimdal currently FTBFS on hurd-i386 for two reasons:

- kafs now defines two ioctls, so it has to define the GNU _IOT
  constant, please apply first attached patch.
- some new occurrences of MAXHOSTNAMELEN appeared, please append the second
  attached patch to 026_posix_max.

Samuel

-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 
'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.25
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)
Shell: /bin/sh linked to /bin/bash

-- 
Samuel
«Le monochrome, c'est pour ceux qui s'intéressent (encore) au contenu. 
 Usenet dans ces conditions, c'est comme le web avec lynx, on prend 
 trop conscience du vide, c'est déprimant.»
-+- JLC in Guide du linuxien pervers : Coup de cafard... -+-
--- heimdal-1.1/lib/kafs/kafs.h 2008-05-27 15:38:28.9 +
+++ heimdal-1.1-mine/lib/kafs/kafs.h2008-05-27 15:40:15.2 +
@@ -46,6 +46,9 @@
 #define AFSCALL_SETPAG 21
 
 #ifndef _VICEIOCTL
+#ifdef __GNU__
+#define _IOT_ViceIoctl _IOT(_IOTS(caddr_t), 2, _IOTS(short), 2, 0, 0)
+#endif
 #define _VICEIOCTL(id)  ((unsigned int ) _IOW('V', id, struct ViceIoctl))
 #define _AFSCIOCTL(id)  ((unsigned int ) _IOW('C', id, struct ViceIoctl))
 #endif /* _VICEIOCTL */
--- heimdal-1.1/lib/kafs/afssys.c   2008-01-24 13:11:45.78000 +
+++ heimdal-1.1-mine/lib/kafs/afssys.c  2008-05-27 17:18:11.54000 +
@@ -42,7 +42,10 @@
 unsigned long param1;
 unsigned long syscall;
 };
-#define VIOC_SYSCALL_PROC _IOW('C', 1, void *)
+#ifdef __GNU__
+#define _IOT_procdata _IOT(_IOTS(long), 5, 0, 0, 0, 0)
+#endif
+#define VIOC_SYSCALL_PROC _IOW('C', 1, struct procdata)
 
 struct devdata {
 unsigned long syscall;
@@ -54,6 +57,9 @@
 unsigned long param6;
 unsigned long retval;
 };
+#ifdef __GNU__
+#define _IOT_devdata _IOT(_IOTS(long), 8, 0, 0, 0, 0)
+#endif
 #define VIOC_SYSCALL_DEV _IOWR('C', 2, struct devdata)
 #define VIOC_SYSCALL_DEV_OPENAFS _IOWR('C', 1, struct devdata)
 
--- heimdal-1.1/lib/gssapi/krb5/import_name.c   2008-01-24 13:11:49.0 
+
+++ heimdal-1.1-mine/lib/gssapi/krb5/import_name.c  2008-05-27 
18:25:29.12000 +
@@ -93,7 +93,7 @@
 char *tmp;
 char *p;
 char *host;
-char local_hostname[MAXHOSTNAMELEN];
+char local_hostname[MaxHostNameLen];
 krb5_principal princ = NULL;
 
 tmp = malloc (input_name_buffer-length + 1);
--- heimdal-1.1/lib/gssapi/spnego/accept_sec_context.c  2008-01-24 
13:11:47.0 +
+++ heimdal-1.1-mine/lib/gssapi/spnego/accept_sec_context.c 2008-05-27 
18:45:52.85000 +
@@ -92,7 +92,7 @@
  gss_buffer_t output_token)
 {
 NegotiationTokenWin nt;
-char hostname[MAXHOSTNAMELEN + 1], *p;
+char hostname[MaxHostNameLen + 1], *p;
 gss_buffer_desc name_buf;
 gss_OID name_type;
 gss_name_t target_princ;
@@ -421,7 +421,7 @@
 if (verify_p) {
gss_name_t name = GSS_C_NO_NAME;
gss_buffer_desc namebuf;
-   char *str = NULL, *host, hostname[MAXHOSTNAMELEN];
+   char *str = NULL, *host, hostname[MaxHostNameLen];
 
host = getenv(GSSAPI_SPNEGO_NAME);
if (host == NULL || issuid()) {
--- heimdal-1.1/appl/gssmask/gssmask.c  2008-01-24 13:10:25.0 +
+++ heimdal-1.1-mine/appl/gssmask/gssmask.c 2008-05-27 19:20:22.85000 
+
@@ -55,7 +55,7 @@
 struct handle *handles;
 struct sockaddr_storage sa;
 socklen_t salen;
-char servername[MAXHOSTNAMELEN];
+char servername[MaxHostNameLen];
 };
 
 FILE *logfile;
@@ -929,7 +929,7 @@
 if (moniker) {
c-moniker = estrdup(moniker);
 } else {
-   char hostname[MAXHOSTNAMELEN];
+   char hostname[MaxHostNameLen];
gethostname(hostname, sizeof(hostname));
asprintf(c-moniker, gssmask: %s:%d, hostname, port);
 }