diff options
author | Erwin Lansing <erwin@FreeBSD.org> | 2012-12-17 10:58:24 +0000 |
---|---|---|
committer | Erwin Lansing <erwin@FreeBSD.org> | 2012-12-17 10:58:24 +0000 |
commit | 823eb5f9dd4d336a5cd85e9129ab1da5676191df (patch) | |
tree | 840dc4ed116d4d74d5bf86e593e1d96d38b4b07f /lib/lwres | |
parent | e65fce108837a6a80efa79ff174877e27db324c0 (diff) | |
download | src-vendor/bind9-9.6.tar.gz src-vendor/bind9-9.6.zip |
Vendor import of Bind 9.6-ESV-R8vendor/bind9/9.6-ESV-R8vendor/bind9-9.6
Approved by: delphij (mentor)
Sponsored by: DK Hostmaster A/S
Notes
Notes:
svn path=/vendor/bind9/dist-9.6/; revision=244353
svn path=/vendor/bind9/9.6-ESV-R8/; revision=244354; tag=vendor/bind9/9.6-ESV-R8
Diffstat (limited to 'lib/lwres')
-rw-r--r-- | lib/lwres/Makefile.in | 2 | ||||
-rw-r--r-- | lib/lwres/api | 2 | ||||
-rw-r--r-- | lib/lwres/getaddrinfo.c | 6 | ||||
-rw-r--r-- | lib/lwres/include/Makefile.in | 2 | ||||
-rw-r--r-- | lib/lwres/include/lwres/Makefile.in | 2 | ||||
-rw-r--r-- | lib/lwres/man/Makefile.in | 2 | ||||
-rw-r--r-- | lib/lwres/unix/Makefile.in | 2 | ||||
-rw-r--r-- | lib/lwres/unix/include/Makefile.in | 2 | ||||
-rw-r--r-- | lib/lwres/unix/include/lwres/Makefile.in | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/lib/lwres/Makefile.in b/lib/lwres/Makefile.in index 858b325d1472..0cf873b51560 100644 --- a/lib/lwres/Makefile.in +++ b/lib/lwres/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2005, 2007, 2012 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000, 2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/lwres/api b/lib/lwres/api index 04068cefaf9c..d15c78ebe60d 100644 --- a/lib/lwres/api +++ b/lib/lwres/api @@ -4,5 +4,5 @@ # 9.8: 80-89 # 9.9: 90-109 LIBINTERFACE = 50 -LIBREVISION = 5 +LIBREVISION = 6 LIBAGE = 0 diff --git a/lib/lwres/getaddrinfo.c b/lib/lwres/getaddrinfo.c index 8244bf3b326b..f8b4c81d2c41 100644 --- a/lib/lwres/getaddrinfo.c +++ b/lib/lwres/getaddrinfo.c @@ -398,7 +398,7 @@ lwres_getaddrinfo(const char *hostname, const char *servname, goto inet6_addr; } addrsize = sizeof(struct in_addr); - addroff = (char *)(&SIN(0)->sin_addr) - (char *)0; + addroff = offsetof(struct sockaddr_in, sin_addr); family = AF_INET; goto common; #ifdef LWRES_HAVE_SIN6_SCOPE_ID @@ -408,7 +408,7 @@ lwres_getaddrinfo(const char *hostname, const char *servname, if (family && family != AF_INET6) return (EAI_NONAME); addrsize = sizeof(struct in6_addr); - addroff = (char *)(&SIN6(0)->sin6_addr) - (char *)0; + addroff = offsetof(struct sockaddr_in6, sin6_addr); family = AF_INET6; goto common; #endif @@ -417,7 +417,7 @@ lwres_getaddrinfo(const char *hostname, const char *servname, return (EAI_NONAME); inet6_addr: addrsize = sizeof(struct in6_addr); - addroff = (char *)(&SIN6(0)->sin6_addr) - (char *)0; + addroff = offsetof(struct sockaddr_in6, sin6_addr); family = AF_INET6; common: diff --git a/lib/lwres/include/Makefile.in b/lib/lwres/include/Makefile.in index 4750a5e96194..6c3d07fd3c38 100644 --- a/lib/lwres/include/Makefile.in +++ b/lib/lwres/include/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2012 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000, 2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/lwres/include/lwres/Makefile.in b/lib/lwres/include/lwres/Makefile.in index fc3126f8a25d..36b8b03d5d0a 100644 --- a/lib/lwres/include/lwres/Makefile.in +++ b/lib/lwres/include/lwres/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2012 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000, 2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/lwres/man/Makefile.in b/lib/lwres/man/Makefile.in index cb723c273577..80db9f2ff5dd 100644 --- a/lib/lwres/man/Makefile.in +++ b/lib/lwres/man/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2012 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/lwres/unix/Makefile.in b/lib/lwres/unix/Makefile.in index 5d77208a9537..26ca4fb8211a 100644 --- a/lib/lwres/unix/Makefile.in +++ b/lib/lwres/unix/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2012 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/lwres/unix/include/Makefile.in b/lib/lwres/unix/include/Makefile.in index 61906330a641..5372543cc014 100644 --- a/lib/lwres/unix/include/Makefile.in +++ b/lib/lwres/unix/include/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2012 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/lwres/unix/include/lwres/Makefile.in b/lib/lwres/unix/include/lwres/Makefile.in index c943e015dea9..4f60ce82f886 100644 --- a/lib/lwres/unix/include/lwres/Makefile.in +++ b/lib/lwres/unix/include/lwres/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2012 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any |