From 6ee87022b592ef3928d6e0fe24394f901799b2db Mon Sep 17 00:00:00 2001
From: jason <>
Date: Thu, 15 Jun 2000 03:35:50 +0000
Subject: Pull in patch from current (itojun): correct behavior against invalid
 sockaddr.  previous code may return 0 (success) on invalid sockaddr. sync
 with rfc2553bis regarding to getnameinfo error code.  (sync with kame)

---
 src/lib/libc/net/getnameinfo.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/libc/net/getnameinfo.c b/src/lib/libc/net/getnameinfo.c
index 673ead74ba..8fda759b6f 100644
--- a/src/lib/libc/net/getnameinfo.c
+++ b/src/lib/libc/net/getnameinfo.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: getnameinfo.c,v 1.14 2000/04/26 16:08:12 itojun Exp $	*/
-/*	$KAME: getnameinfo.c,v 1.38 2000/04/26 15:58:50 itojun Exp $	*/
+/*	$OpenBSD: getnameinfo.c,v 1.14.2.1 2000/06/15 03:35:50 jason Exp $	*/
+/*	$KAME: getnameinfo.c,v 1.42 2000/06/12 02:51:06 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,13 +91,13 @@ static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *,
 static int ip6_sa2str __P((const struct sockaddr_in6 *, char *, size_t, int));
 #endif 
 
-#define ENI_NOSOCKET 	0
-#define ENI_NOSERVNAME	1
-#define ENI_NOHOSTNAME	2
-#define ENI_MEMORY	3
-#define ENI_SYSTEM	4
-#define ENI_FAMILY	5
-#define ENI_SALEN	6
+#define ENI_NOSOCKET 	EAI_FAIL		/*XXX*/
+#define ENI_NOSERVNAME	EAI_NONAME
+#define ENI_NOHOSTNAME	EAI_NONAME
+#define ENI_MEMORY	EAI_MEMORY
+#define ENI_SYSTEM	EAI_SYSTEM
+#define ENI_FAMILY	EAI_FAMILY
+#define ENI_SALEN	EAI_FAIL		/*XXX*/
 
 int
 getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
-- 
cgit v1.2.3-55-g6feb