summaryrefslogtreecommitdiff
path: root/usr/src/lib/libsocket
diff options
context:
space:
mode:
authoryan zhang - Sun Microsystems - Menlo Park United States <Y.Zhang@Sun.COM>2010-03-17 13:30:07 -0700
committeryan zhang - Sun Microsystems - Menlo Park United States <Y.Zhang@Sun.COM>2010-03-17 13:30:07 -0700
commit1bb3da971ea161535ee48688aee21f554e60811a (patch)
tree186979829c118314becc64921e120249e66d5105 /usr/src/lib/libsocket
parentdfe4040d6edf92f7d63a1cbac17c5da83512671b (diff)
downloadillumos-gate-1bb3da971ea161535ee48688aee21f554e60811a.tar.gz
6847733 getaddrinfo returns wrong protocol
Diffstat (limited to 'usr/src/lib/libsocket')
-rw-r--r--usr/src/lib/libsocket/inet/getaddrinfo.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/usr/src/lib/libsocket/inet/getaddrinfo.c b/usr/src/lib/libsocket/inet/getaddrinfo.c
index 30b1860eb6..ec72a9974e 100644
--- a/usr/src/lib/libsocket/inet/getaddrinfo.c
+++ b/usr/src/lib/libsocket/inet/getaddrinfo.c
@@ -20,11 +20,10 @@
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
#include <netdb.h>
@@ -457,7 +456,6 @@ _getaddrinfo(const char *hostname, const char *servname,
bzero(nai->ai_addr, addrlen);
nai->ai_addrlen = addrlen;
nai->ai_family = PF_INET6;
- nai->ai_protocol = 0;
nai->ai_canonname = NULL;
if (nai->ai_flags & AI_PASSIVE) {
ai2sin6(nai)->sin6_addr = in6addr_any;
@@ -496,7 +494,6 @@ v4only:
bzero(nai->ai_addr, addrlen);
nai->ai_addrlen = addrlen;
nai->ai_family = PF_INET;
- nai->ai_protocol = 0;
nai->ai_canonname = NULL;
if (nai->ai_flags & AI_PASSIVE) {
ai2sin(nai)->sin_addr.s_addr = INADDR_ANY;
@@ -660,7 +657,6 @@ get_addr(int family, const char *hostname, struct addrinfo *aip, struct
bzero(nai->ai_addr, addrlen);
nai->ai_addrlen = addrlen;
nai->ai_family = PF_INET6;
- nai->ai_protocol = 0;
(void) memcpy(ai2sin6(nai)->sin6_addr.s6_addr,
hp->h_addr_list[i], sizeof (struct in6_addr));
@@ -705,7 +701,6 @@ get_addr(int family, const char *hostname, struct addrinfo *aip, struct
bzero(nai->ai_addr, addrlen);
nai->ai_addrlen = addrlen;
nai->ai_family = PF_INET;
- nai->ai_protocol = 0;
(void) memcpy(&(ai2sin(nai)->sin_addr.s_addr),
&v4addr, sizeof (struct in_addr));
nai->ai_canonname = NULL;