+2016-12-27 Florian Weimer <fweimer@redhat.com>
+
+ [BZ #19582]
+ Deprecate RES_USE_INET6.
+ * nis/nss_nis/nis-hosts.c (_nss_nis_gethostent_r)
+ (_nss_nis_gethostbyname2_r, _nss_nis_gethostbyname_r)
+ (_nss_nis_gethostbyaddr_r): Use res_use_inet6 instead of
+ RES_USE_INET6.
+ * nis/nss_nisplus/nisplus-hosts.c (internal_nisplus_gethostent_r)
+ (_nss_nisplus_gethostbyname2_r, _nss_nisplus_gethostbyname_r)
+ (_nss_nisplus_gethostbyaddr_r): Likewise.
+ * nscd/aicache.c (addhstaiX): Use DEPRECATED_RES_USE_INET6 instead
+ of res_use_inet6.
+ * nscd/nscd_gethst_r.c (__nscd_gethostbyname_r): Use res_use_inet6
+ instead of RES_USE_INET6.
+ * nss/digits_dots.c (__nss_hostname_digits_dots): Likewise.
+ * nss/nss_files/files-hosts.c (EXTRA_ARGS_VALUE)
+ (_nss_files_gethostbyname3_r, _nss_files_gethostbyname_r):
+ Likewise.
+ * resolv/compat-gethnamaddr.c (getanswer, res_gethostbyname)
+ (res_gethostbyname2, res_gethostbyaddr, _gethtent, _gethtbyname):
+ Likewise.
+ * resolv/nss_dns/dns-host.c (_nss_dns_gethostbyname3_r)
+ (_nss_dns_gethostbyname_r): Likewise.
+ (_nss_dns_gethostbyaddr2_r): Remove commented-out code for
+ alternate RES_USE_INET6 handling.
+ * resolv/res_debug.c (p_option): Use DEPRECATED_RES_USE_INET6
+ instead of RES_USE_INET6.
+ * resolv/res_init.c (res_setoptions): Likewise.
+ * resolv/resolv.h (RES_USE_INET6): Mark as deprecated.
+ * resolv/resolv-internal.h: New file.
+ * resolv/Makefile (CFLAGS-tst-res_use_inet6.c): Use -Wno-error to
+ make the deprecation warning non-fatal.
+ * resolv/README (Using the resolver in multi-threaded code): Drop
+ reference to RES_USE_INET6.
+ * sysdeps/posix/getaddrinfo.c (gethosts, gaih_inet): Use
+ DEPRECATED_RES_USE_INET6 instead of res_use_inet6.
+
2016-12-31 Florian Weimer <fweimer@redhat.com>
* resolv/Makefile (tests): Add tst-bug18665, tst-bug18665-tcp,
in the <resolv.h> header file have been deprecated. They were already
unimplemented.
+* The "inet6" option in /etc/resolv.conf and the RES_USE_INET6 flag for
+ _res.flags are deprecated. The flag was standardized in RFC 2133, but
+ removed again from the IETF name lookup interface specification in RFC
+ 2553. Applications should use getaddrinfo instead.
+
* DNSSEC-related declarations and definitions have been removed from the
<arpa/nameser.h> header file, and libresolv will no longer attempt to
decode the data part of DNSSEC record types. Previous versions of glibc
#include <string.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <resolv.h>
+#include <resolv/resolv-internal.h>
#include <libc-lock.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
__libc_lock_lock (lock);
status = internal_nis_gethostent_r (host, buffer, buflen, errnop, h_errnop,
- ((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET),
- ((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0 ));
+ (res_use_inet6 () ? AF_INET6 : AF_INET),
+ (res_use_inet6 () ? AI_V4MAPPED : 0 ));
__libc_lock_unlock (lock);
return internal_gethostbyname2_r (name, af, host, buffer, buflen, errnop,
h_errnop,
- ((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0));
+ (res_use_inet6 () ? AI_V4MAPPED : 0));
}
_nss_nis_gethostbyname_r (const char *name, struct hostent *host, char *buffer,
size_t buflen, int *errnop, int *h_errnop)
{
- if (_res.options & RES_USE_INET6)
+ if (res_use_inet6 ())
{
enum nss_status status;
free (result);
int parse_res = parse_line (p, host, data, buflen, errnop, af,
- ((_res.options & RES_USE_INET6)
- ? AI_V4MAPPED : 0));
+ (res_use_inet6 () ? AI_V4MAPPED : 0));
if (__glibc_unlikely (parse_res < 1))
{
if (parse_res == -1)
(NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len)
/* Get implementation for some internal functions. */
+#include <resolv/resolv-internal.h>
#include <resolv/mapv4v6addr.h>
}
}
- if (_res.options & RES_USE_INET6)
+ if (res_use_inet6 ())
parse_res = _nss_nisplus_parse_hostent (result, AF_INET6, host, buffer,
buflen, errnop, AI_V4MAPPED);
else
return internal_gethostbyname2_r (name, af, host, buffer, buflen, errnop,
herrnop,
- ((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0));
+ (res_use_inet6 () ? AI_V4MAPPED : 0));
}
char *buffer, size_t buflen, int *errnop,
int *h_errnop)
{
- if (_res.options & RES_USE_INET6)
+ if (res_use_inet6 ())
{
enum nss_status status;
parse_res = _nss_nisplus_parse_hostent (result, af, host,
buffer, buflen, errnop,
- ((_res.options & RES_USE_INET6)
+ (res_use_inet6 ()
? AI_V4MAPPED : 0));
nis_freeresult (result);
#include <time.h>
#include <unistd.h>
#include <sys/mman.h>
+#include <resolv/resolv-internal.h>
#include <resolv/res_hconf.h>
#include "dbg_log.h"
IPv6 addresses. Currently this is decided by setting the
RES_USE_INET6 bit in _res.options. */
int old_res_options = _res.options;
- _res.options &= ~RES_USE_INET6;
+ _res.options &= ~DEPRECATED_RES_USE_INET6;
size_t tmpbuf6len = 1024;
char *tmpbuf6 = alloca (tmpbuf6len);
}
out:
- _res.options |= old_res_options & RES_USE_INET6;
+ _res.options |= old_res_options & DEPRECATED_RES_USE_INET6;
if (dataset != NULL && !alloca_used)
{
<http://www.gnu.org/licenses/>. */
#include <errno.h>
-#include <resolv.h>
+#include <resolv/resolv-internal.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
{
request_type reqtype;
- reqtype = (_res.options & RES_USE_INET6) ? GETHOSTBYNAMEv6 : GETHOSTBYNAME;
+ reqtype = res_use_inet6 () ? GETHOSTBYNAMEv6 : GETHOSTBYNAME;
return nscd_gethst_r (name, strlen (name) + 1, reqtype, resultbuf,
buffer, buflen, result, h_errnop);
#include <stdlib.h>
#include <ctype.h>
#include <wctype.h>
-#include <resolv.h>
+#include <resolv/resolv-internal.h>
#include <netdb.h>
#include <arpa/inet.h>
#include "nsswitch.h"
break;
default:
- af = (_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET;
+ af = res_use_inet6 () ? AF_INET6 : AF_INET;
addr_size = af == AF_INET6 ? IN6ADDRSZ : INADDRSZ;
break;
}
(*h_addr_ptrs)[0] = (char *) host_addr;
(*h_addr_ptrs)[1] = NULL;
resbuf->h_addr_list = *h_addr_ptrs;
- if (af == AF_INET && (_res.options & RES_USE_INET6))
+ if (af == AF_INET && res_use_inet6 ())
{
/* We need to change the IP v4 address into the
IP v6 address. */
switch (af)
{
default:
- af = (_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET;
+ af = res_use_inet6 () ? AF_INET6 : AF_INET;
if (af == AF_INET6)
{
addr_size = IN6ADDRSZ;
#include <arpa/inet.h>
#include <arpa/nameser.h>
#include <netdb.h>
-#include <resolv.h>
+#include <resolv/resolv-internal.h>
/* Get implementation for some internal functions. */
})
#define EXTRA_ARGS_VALUE \
- , ((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET), \
- ((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0)
+ , (res_use_inet6 () ? AF_INET6 : AF_INET), \
+ (res_use_inet6 () ? AI_V4MAPPED : 0)
#include "files-XXX.c"
#undef EXTRA_ARGS_VALUE
{
/* XXX Is using _res to determine whether we want to convert IPv4
addresses to IPv6 addresses really the right thing to do? */
- int flags = ((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0);
+ int flags = (res_use_inet6 () ? AI_V4MAPPED : 0);
while ((status = internal_getent (stream, result, buffer, buflen, errnop,
herrnop, af, flags))
char *buffer, size_t buflen, int *errnop,
int *herrnop)
{
- int af = ((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET);
+ int af = (res_use_inet6 () ? AF_INET6 : AF_INET);
return _nss_files_gethostbyname3_r (name, af, result, buffer, buflen,
errnop, herrnop, NULL, NULL);
$(objpfx)tst-resolv-basic: $(objpfx)libresolv.so $(shared-thread-library)
$(objpfx)tst-resolv-network: $(objpfx)libresolv.so $(shared-thread-library)
$(objpfx)tst-resolv-search: $(objpfx)libresolv.so $(shared-thread-library)
+
+# This test case uses the deprecated RES_USE_INET6 resolver option.
+CFLAGS-tst-res_use_inet6.c += -Wno-error
* In Multi-threaded that manipulate the _res structure, calls to
functions like `gethostbyname' in threads other than the "main"
- thread won't be influenced by the those changes anymore. So if you
- set RES_USE_INET6, a call to `gethostbyname' won't return any IPv6
- hosts anymore. If you recompile such programs, manipulating the
- _res structure will affect the thread in which you do so instead of
- the "main" thread.
+ thread won't be influenced by the those changes anymore.
We recommend to use the new thread-safe interfaces in new code, since
the traditional interfaces have been deprecated by the BIND folks.
# include <stdio.h>
# include <netdb.h>
-# include <resolv.h>
+# include <resolv/resolv-internal.h>
# include <ctype.h>
# include <errno.h>
# include <stdlib.h>
bp += n;
buflen -= n;
}
- if (_res.options & RES_USE_INET6)
+ if (res_use_inet6 ())
map_v4v6_hostent(&host, &bp, &buflen);
__set_h_errno (NETDB_SUCCESS);
return (&host);
__set_h_errno (NETDB_INTERNAL);
return (NULL);
}
- if (_res.options & RES_USE_INET6) {
+ if (res_use_inet6 ()) {
hp = res_gethostbyname2(name, AF_INET6);
if (hp)
return (hp);
h_addr_ptrs[0] = (char *)host_addr;
h_addr_ptrs[1] = NULL;
host.h_addr_list = h_addr_ptrs;
- if (_res.options & RES_USE_INET6)
+ if (res_use_inet6 ())
map_v4v6_hostent(&host, &bp, &len);
__set_h_errno (NETDB_SUCCESS);
return (&host);
memmove(host_addr, addr, len);
h_addr_ptrs[0] = (char *)host_addr;
h_addr_ptrs[1] = NULL;
- if (af == AF_INET && (_res.options & RES_USE_INET6)) {
+ if (af == AF_INET && res_use_inet6 ()) {
map_v4v6_address((char*)host_addr, (char*)host_addr);
hp->h_addrtype = AF_INET6;
hp->h_length = IN6ADDRSZ;
af = AF_INET6;
len = IN6ADDRSZ;
} else if (inet_pton(AF_INET, p, host_addr) > 0) {
- if (_res.options & RES_USE_INET6) {
+ if (res_use_inet6 ()) {
map_v4v6_address((char*)host_addr, (char*)host_addr);
af = AF_INET6;
len = IN6ADDRSZ;
{
struct hostent *hp;
- if (_res.options & RES_USE_INET6) {
+ if (res_use_inet6 ()) {
hp = _gethtbyname2(name, AF_INET6);
if (hp)
return (hp);
#include "nsswitch.h"
-/* Get implementation for some internal functions. */
+/* Get implementeation for some internal functions. */
+#include <resolv/resolv-internal.h>
#include <resolv/mapv4v6addr.h>
#include <resolv/mapv4v6hostent.h>
/* If we are looking for an IPv6 address and mapping is enabled
by having the RES_USE_INET6 bit in _res.options set, we try
another lookup. */
- if (af == AF_INET6 && (_res.options & RES_USE_INET6))
+ if (af == AF_INET6 && res_use_inet6 ())
n = __libc_res_nsearch (&_res, name, C_IN, T_A, host_buffer.buf->buf,
host_buffer.buf != orig_host_buffer
? MAXPACKET : 1024, &host_buffer.ptr,
{
enum nss_status status = NSS_STATUS_NOTFOUND;
- if (_res.options & RES_USE_INET6)
+ if (res_use_inet6 ())
status = _nss_dns_gethostbyname3_r (name, AF_INET6, result, buffer,
buflen, errnop, h_errnop, NULL, NULL);
if (status == NSS_STATUS_NOTFOUND)
memcpy (host_data->host_addr, addr, len);
host_data->h_addr_ptrs[0] = (char *) host_data->host_addr;
host_data->h_addr_ptrs[1] = NULL;
-#if 0
- /* XXX I think this is wrong. Why should an IPv4 address be
- converted to IPv6 if the user explicitly asked for IPv4? */
- if (af == AF_INET && (_res.options & RES_USE_INET6))
- {
- map_v4v6_address ((char *) host_data->host_addr,
- (char *) host_data->host_addr);
- result->h_addrtype = AF_INET6;
- result->h_length = IN6ADDRSZ;
- }
-#endif
*h_errnop = NETDB_SUCCESS;
return NSS_STATUS_SUCCESS;
}
#include <errno.h>
#include <math.h>
#include <netdb.h>
-#include <resolv.h>
+#include <resolv/resolv-internal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
case RES_INSECURE1: return "insecure1";
case RES_INSECURE2: return "insecure2";
case RES_NOALIASES: return "noaliases";
- case RES_USE_INET6: return "inet6";
+ case DEPRECATED_RES_USE_INET6: return "inet6";
case RES_ROTATE: return "rotate";
case RES_BLAST: return "blast";
case RES_USE_EDNS0: return "edns0";
#include <ctype.h>
#include <netdb.h>
-#include <resolv.h>
+#include <resolv/resolv-internal.h>
#include <stdio.h>
#include <stdio_ext.h>
#include <stdlib.h>
unsigned long int flag;
} options[] = {
#define STRnLEN(str) str, sizeof (str) - 1
- { STRnLEN ("inet6"), 0, RES_USE_INET6 },
+ { STRnLEN ("inet6"), 0, DEPRECATED_RES_USE_INET6 },
{ STRnLEN ("rotate"), 0, RES_ROTATE },
{ STRnLEN ("edns0"), 0, RES_USE_EDNS0 },
{ STRnLEN ("single-request-reopen"), 0, RES_SNGLKUPREOP },
--- /dev/null
+/* libresolv interfaces for internal use across glibc.
+ Copyright (C) 2016 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _RESOLV_INTERNAL_H
+#define _RESOLV_INTERNAL_H 1
+
+#include <resolv.h>
+#include <stdbool.h>
+
+/* Internal version of RES_USE_INET6 which does not trigger a
+ deprecation warning. */
+#define DEPRECATED_RES_USE_INET6 0x00002000
+
+static inline bool
+res_use_inet6 (void)
+{
+ return _res.options & DEPRECATED_RES_USE_INET6;
+}
+
+#endif /* _RESOLV_INTERNAL_H */
#define RES_INSECURE1 0x00000400 /* type 1 security disabled */
#define RES_INSECURE2 0x00000800 /* type 2 security disabled */
#define RES_NOALIASES 0x00001000 /* shuts off HOSTALIASES feature */
-#define RES_USE_INET6 0x00002000 /* use/map IPv6 in gethostbyname() */
+#define RES_USE_INET6 \
+ __glibc_macro_warning ("RES_USE_INET6 is deprecated") 0x00002000
#define RES_ROTATE 0x00004000 /* rotate ns list after each query */
#define RES_NOCHECKNAME \
__glibc_macro_warning ("RES_NOCHECKNAME is deprecated") 0x00008000
#include <ifaddrs.h>
#include <netdb.h>
#include <nss.h>
-#include <resolv.h>
+#include <resolv/resolv-internal.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdio_ext.h>
if (herrno == NETDB_INTERNAL) \
{ \
__set_h_errno (herrno); \
- _res.options |= old_res_options & RES_USE_INET6; \
+ _res.options |= old_res_options & DEPRECATED_RES_USE_INET6; \
result = -EAI_SYSTEM; \
goto free_and_return; \
} \
addrmem = NULL; \
if (!convert_hostent_to_gaih_addrtuple (req, _family,h, &addrmem)) \
{ \
- _res.options |= old_res_options & RES_USE_INET6; \
+ _res.options |= old_res_options & DEPRECATED_RES_USE_INET6; \
result = -EAI_SYSTEM; \
goto free_and_return; \
} \
addresses to IPv6 addresses. Currently this is decided
by setting the RES_USE_INET6 bit in _res.options. */
old_res_options = _res.options;
- _res.options &= ~RES_USE_INET6;
+ _res.options &= ~DEPRECATED_RES_USE_INET6;
while (!no_more)
{
if (!scratch_buffer_grow (tmpbuf))
{
- _res.options |= old_res_options & RES_USE_INET6;
+ _res.options
+ |= old_res_options & DEPRECATED_RES_USE_INET6;
result = -EAI_MEMORY;
goto free_and_return;
}
if (canonbuf == NULL)
{
_res.options
- |= old_res_options & RES_USE_INET6;
+ |= old_res_options
+ & DEPRECATED_RES_USE_INET6;
result = -EAI_MEMORY;
goto free_and_return;
}
nip = nip->next;
}
- _res.options |= old_res_options & RES_USE_INET6;
+ _res.options |= old_res_options & DEPRECATED_RES_USE_INET6;
if (h_errno == NETDB_INTERNAL)
{
projects / platform / upstream / glibc.git / commitdiff