summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjason <>2000-06-15 03:35:50 +0000
committerjason <>2000-06-15 03:35:50 +0000
commit6ee87022b592ef3928d6e0fe24394f901799b2db (patch)
tree6c3c56692c9001eca913c46ebe20a5c6b87c5584
parent55776980eeebfc9d62564e73c6cdfbec9a9ea535 (diff)
downloadopenbsd-OPENBSD_2_7.tar.gz
openbsd-OPENBSD_2_7.tar.bz2
openbsd-OPENBSD_2_7.zip
Pull in patch from current (itojun):OPENBSD_2_7
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)
-rw-r--r--src/lib/libc/net/getnameinfo.c18
1 files 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 @@
1/* $OpenBSD: getnameinfo.c,v 1.14 2000/04/26 16:08:12 itojun Exp $ */ 1/* $OpenBSD: getnameinfo.c,v 1.14.2.1 2000/06/15 03:35:50 jason Exp $ */
2/* $KAME: getnameinfo.c,v 1.38 2000/04/26 15:58:50 itojun Exp $ */ 2/* $KAME: getnameinfo.c,v 1.42 2000/06/12 02:51:06 itojun Exp $ */
3 3
4/* 4/*
5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. 5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,13 +91,13 @@ static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *,
91static int ip6_sa2str __P((const struct sockaddr_in6 *, char *, size_t, int)); 91static int ip6_sa2str __P((const struct sockaddr_in6 *, char *, size_t, int));
92#endif 92#endif
93 93
94#define ENI_NOSOCKET 0 94#define ENI_NOSOCKET EAI_FAIL /*XXX*/
95#define ENI_NOSERVNAME 1 95#define ENI_NOSERVNAME EAI_NONAME
96#define ENI_NOHOSTNAME 2 96#define ENI_NOHOSTNAME EAI_NONAME
97#define ENI_MEMORY 3 97#define ENI_MEMORY EAI_MEMORY
98#define ENI_SYSTEM 4 98#define ENI_SYSTEM EAI_SYSTEM
99#define ENI_FAMILY 5 99#define ENI_FAMILY EAI_FAMILY
100#define ENI_SALEN 6 100#define ENI_SALEN EAI_FAIL /*XXX*/
101 101
102int 102int
103getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) 103getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)