Index: ChangeLog
===================================================================
RCS file: /afs/pdc.kth.se/src/packages/kth-krb/SourceRepository/heimdal/ChangeLog,v
retrieving revision 1.1229
retrieving revision 1.1230
diff -u -u -w -r1.1229 -r1.1230
--- ChangeLog	1 Dec 2003 17:34:27 -0000	1.1229
+++ ChangeLog	2 Dec 2003 11:33:04 -0000	1.1230
@@ -1,3 +1,12 @@
+2003-12-02  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* lib/krb5/eai_to_heim_errno.c: EAI_ADDRFAMILY and EAI_NODATA is
+	deprecated in RFC3493
+
+	* lib/krb5/verify_krb5_conf.c (check_host): don't check for
+	EAI_NODATA, because its depricated in RFC3493 Pointed out by
+	Hajimu UMEMOTO <ume@mahoroba.org> on heimdal-discuss
+
 2003-12-01  Love Hörnquist Åstrand  <lha@it.su.se>
 
 	* lib/krb5/Makefile.am: move test_crypto to noinst_PROGRAMS
Index: lib/krb5/eai_to_heim_errno.c
===================================================================
RCS file: /afs/pdc.kth.se/src/packages/kth-krb/SourceRepository/heimdal/lib/krb5/eai_to_heim_errno.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -w -r1.3 -r1.4
--- lib/krb5/eai_to_heim_errno.c	14 May 2001 22:48:33 -0000	1.3
+++ lib/krb5/eai_to_heim_errno.c	2 Dec 2003 11:32:22 -0000	1.4
@@ -33,7 +33,7 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id: eai_to_heim_errno.c,v 1.3 2001/05/14 22:48:33 assar Exp $");
+RCSID("$Id: eai_to_heim_errno.c,v 1.4 2003/12/02 11:32:22 lha Exp $");
 
 /*
  * convert the getaddrinfo error code in `eai_errno' into a
@@ -47,8 +47,10 @@
     switch(eai_errno) {
     case EAI_NOERROR:
 	return 0;
+#ifdef EAI_ADDRFAMILY
     case EAI_ADDRFAMILY:
 	return HEIM_EAI_ADDRFAMILY;
+#endif
     case EAI_AGAIN:
 	return HEIM_EAI_AGAIN;
     case EAI_BADFLAGS:
@@ -59,8 +61,10 @@
 	return HEIM_EAI_FAMILY;
     case EAI_MEMORY:
 	return HEIM_EAI_MEMORY;
+#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME
     case EAI_NODATA:
 	return HEIM_EAI_NODATA;
+#endif
     case EAI_NONAME:
 	return HEIM_EAI_NONAME;
     case EAI_SERVICE:
Index: lib/krb5/verify_krb5_conf.c
===================================================================
RCS file: /afs/pdc.kth.se/src/packages/kth-krb/SourceRepository/heimdal/lib/krb5/verify_krb5_conf.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -u -w -r1.22 -r1.23
--- lib/krb5/verify_krb5_conf.c	21 Oct 2003 11:59:16 -0000	1.22
+++ lib/krb5/verify_krb5_conf.c	2 Dec 2003 11:25:01 -0000	1.23
@@ -35,7 +35,7 @@
 #include <getarg.h>
 #include <parse_bytes.h>
 #include <err.h>
-RCSID("$Id: verify_krb5_conf.c,v 1.22 2003/10/21 11:59:16 joda Exp $");
+RCSID("$Id: verify_krb5_conf.c,v 1.23 2003/12/02 11:25:01 lha Exp $");
 
 /* verify krb5.conf */
 
@@ -159,9 +159,6 @@
     hostname[strcspn(hostname, "/")] = '\0';
     ret = getaddrinfo(hostname, "telnet" /* XXX */, NULL, &ai);
     if(ret != 0) {
-	if(ret == EAI_NODATA)
-	    krb5_warnx(context, "%s: host not found (%s)", path, hostname);
-	else
 	    krb5_warnx(context, "%s: %s (%s)", path, gai_strerror(ret), hostname);
 	return 1;
     }
Index: lib/roken/ChangeLog
===================================================================
RCS file: /afs/pdc.kth.se/src/packages/kth-krb/SourceRepository/lib/roken/ChangeLog,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -u -w -r1.301 -r1.302
--- lib/roken/ChangeLog	5 Oct 2003 00:16:34 -0000	1.301
+++ lib/roken/ChangeLog	2 Dec 2003 12:03:25 -0000	1.302
@@ -1,3 +1,10 @@
+2003-12-02  Love Hörnquist Åstrand  <lha@it.su.se>
+	
+	* gai_strerror.c: EAI_ADDRFAMILY and EAI_NODATA is deprecated
+	
+	* roken-common.h: use EAI_NONAME instead of EAI_ADDRFAMILY to
+	check for if we need EAI_ macros
+
 2003-10-04   Love Hörnquist Åstrand  <lha@it.su.se>
 
 	* strptime.c: let t and n match zero or more whitespaces
Index: lib/roken/gai_strerror.c
===================================================================
RCS file: /afs/pdc.kth.se/src/packages/kth-krb/SourceRepository/lib/roken/gai_strerror.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -w -r1.2 -r1.3
--- lib/roken/gai_strerror.c	3 Dec 1999 04:10:06 -0000	1.2
+++ lib/roken/gai_strerror.c	2 Dec 2003 11:30:52 -0000	1.3
@@ -33,7 +33,7 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id: gai_strerror.c,v 1.2 1999/12/03 04:10:06 assar Exp $");
+RCSID("$Id: gai_strerror.c,v 1.3 2003/12/02 11:30:52 lha Exp $");
 #endif
 
 #include "roken.h"
@@ -43,13 +43,17 @@
     char *str;
 } errors[] = {
 {EAI_NOERROR,		"no error"},
+#ifndef EAI_ADDRFAMILY
 {EAI_ADDRFAMILY,	"address family for nodename not supported"},
+#endif
 {EAI_AGAIN,		"temporary failure in name resolution"},
 {EAI_BADFLAGS,		"invalid value for ai_flags"},
 {EAI_FAIL,		"non-recoverable failure in name resolution"},
 {EAI_FAMILY,		"ai_family not supported"},
 {EAI_MEMORY,		"memory allocation failure"},
+#ifdef EAI_NODATA
 {EAI_NODATA,		"no address associated with nodename"},
+#endif
 {EAI_NONAME,		"nodename nor servname provided, or not known"},
 {EAI_SERVICE,		"servname not supported for ai_socktype"},
 {EAI_SOCKTYPE,		"ai_socktype not supported"},
Index: lib/roken/roken-common.h
===================================================================
RCS file: /afs/pdc.kth.se/src/packages/kth-krb/SourceRepository/lib/roken/roken-common.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -u -w -r1.51 -r1.52
--- lib/roken/roken-common.h	9 Sep 2002 13:41:12 -0000	1.51
+++ lib/roken/roken-common.h	2 Dec 2003 11:28:31 -0000	1.52
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: roken-common.h,v 1.51 2002/09/09 13:41:12 joda Exp $ */
+/* $Id: roken-common.h,v 1.52 2003/12/02 11:28:31 lha Exp $ */
 
 #ifndef __ROKEN_COMMON_H__
 #define __ROKEN_COMMON_H__
@@ -172,7 +172,7 @@
 #define EAI_NOERROR	0	/* no error */
 #endif
 
-#ifndef EAI_ADDRFAMILY
+#ifndef EAI_NONAME
 
 #define EAI_ADDRFAMILY	1	/* address family for nodename not supported */
 #define EAI_AGAIN	2	/* temporary failure in name resolution */
@@ -186,7 +186,7 @@
 #define EAI_SOCKTYPE   10	/* ai_socktype not supported */
 #define EAI_SYSTEM     11	/* system error returned in errno */
 
-#endif /* EAI_ADDRFAMILY */
+#endif /* EAI_NONAME */
 
 /* flags for getaddrinfo() */