AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolv: Remove RES_NOIP6DOTINT and its implementation

Browse Source
This commit is contained in:
Florian Weimer 2016-10-07 13:55:47 +02:00
parent bfbd1de159
commit 7ec47a85d8
7 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2016-10-07 Florian Weimer <fweimer@redhat.com>
resolv: Remove RES_NOIP6DOTINT and its implementation.
* resolv/resolv.h (RES_DEFAULT): Remove RES_NOIP6DOTINT.
(RES_NOIP6DOTINT): Remove.
* resolv/gethnamaddr.c (gethostbyaddr): Remove RES_NOIP6DOTINT
handling.
* resolv/res_debug.c (p_option): Likewise.
* resolv/res_init.c (res_setoptions): Likewise.
* resolv/nss_dns/dns-host.c (_nss_dns_gethostbyaddr2_r): Likewise.
2016-10-07 Florian Weimer <fweimer@redhat.com> 2016-10-07 Florian Weimer <fweimer@redhat.com>
resolv: Deprecate unimplemented flags. resolv: Deprecate unimplemented flags.

5
NEWS
View File

@ -59,6 +59,11 @@ Version 2.25
for the Linux quota interface which predates kernel version 2.4.22 has for the Linux quota interface which predates kernel version 2.4.22 has
been removed. been removed.
* The “ip6-dotint” and “no-ip6-dotint” resolver options, and the
corresponding RES_NOIP6DOTINT flag from <resolv.h> have been removed.
“no-ip6-dotint” had already been the default, and support for the
“ip6-dotint” option was removed from the Internet in 2006.
* The flags RES_AAONLY, RES_PRIMARY, RES_NOCHECKNAME, RES_KEEPTSIG defined * The flags RES_AAONLY, RES_PRIMARY, RES_NOCHECKNAME, RES_KEEPTSIG defined
in the <resolv.h> header file have been deprecated. They were already in the <resolv.h> header file have been deprecated. They were already
unimplemented. unimplemented.

6
resolv/gethnamaddr.c
View File

@ -642,12 +642,6 @@ gethostbyaddr (const void *addr, socklen_t len, int af)
n = __libc_res_nquery(&_res, qbuf, C_IN, T_PTR, buf.buf->buf, 1024, n = __libc_res_nquery(&_res, qbuf, C_IN, T_PTR, buf.buf->buf, 1024,
&buf.ptr, NULL, NULL, NULL, NULL); &buf.ptr, NULL, NULL, NULL, NULL);
if (n < 0 && af == AF_INET6 && (_res.options & RES_NOIP6DOTINT) == 0) {
strcpy(qp, "ip6.int");
n = __libc_res_nquery(&_res, qbuf, C_IN, T_PTR, buf.buf->buf,
buf.buf != orig_buf ? MAXPACKET : 1024,
&buf.ptr, NULL, NULL, NULL, NULL);
}
if (n < 0) { if (n < 0) {
if (buf.buf != orig_buf) if (buf.buf != orig_buf)
free (buf.buf); free (buf.buf);

8
resolv/nss_dns/dns-host.c
View File

@ -495,14 +495,6 @@ _nss_dns_gethostbyaddr2_r (const void *addr, socklen_t len, int af,
n = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, host_buffer.buf->buf, n = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, host_buffer.buf->buf,
1024, &host_buffer.ptr, NULL, NULL, NULL, NULL); 1024, &host_buffer.ptr, NULL, NULL, NULL, NULL);
if (n < 0 && af == AF_INET6 && (_res.options & RES_NOIP6DOTINT) == 0)
{
strcpy (qp, "ip6.int");
n = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, host_buffer.buf->buf,
host_buffer.buf != orig_host_buffer
? MAXPACKET : 1024, &host_buffer.ptr,
NULL, NULL, NULL, NULL);
}
if (n < 0) if (n < 0)
{ {
*h_errnop = h_errno; *h_errnop = h_errno;

1
resolv/res_debug.c
View File

@ -559,7 +559,6 @@ p_option(u_long option) {
case RES_ROTATE: return "rotate"; case RES_ROTATE: return "rotate";
case RES_BLAST: return "blast"; case RES_BLAST: return "blast";
case RES_USEBSTRING: return "ip6-bytestring"; case RES_USEBSTRING: return "ip6-bytestring";
case RES_NOIP6DOTINT: return "no-ip6-dotint";
case RES_USE_EDNS0: return "edns0"; case RES_USE_EDNS0: return "edns0";
case RES_SNGLKUP: return "single-request"; case RES_SNGLKUP: return "single-request";
case RES_SNGLKUPREOP: return "single-request-reopen"; case RES_SNGLKUPREOP: return "single-request-reopen";

2
resolv/res_init.c
View File

@ -439,8 +439,6 @@ res_setoptions(res_state statp, const char *options, const char *source) {
#define STRnLEN(str) str, sizeof (str) - 1 #define STRnLEN(str) str, sizeof (str) - 1
{ STRnLEN ("inet6"), 0, RES_USE_INET6 }, { STRnLEN ("inet6"), 0, RES_USE_INET6 },
{ STRnLEN ("ip6-bytestring"), 0, RES_USEBSTRING }, { STRnLEN ("ip6-bytestring"), 0, RES_USEBSTRING },
{ STRnLEN ("no-ip6-dotint"), 0, RES_NOIP6DOTINT },
{ STRnLEN ("ip6-dotint"), 1, ~RES_NOIP6DOTINT },
{ STRnLEN ("rotate"), 0, RES_ROTATE }, { STRnLEN ("rotate"), 0, RES_ROTATE },
{ STRnLEN ("edns0"), 0, RES_USE_EDNS0 }, { STRnLEN ("edns0"), 0, RES_USE_EDNS0 },
{ STRnLEN ("single-request-reopen"), 0, RES_SNGLKUPREOP }, { STRnLEN ("single-request-reopen"), 0, RES_SNGLKUPREOP },

4
resolv/resolv.h
View File

@ -199,8 +199,6 @@ struct res_sym {
#define RES_BLAST 0x00020000 /* blast all recursive servers */ #define RES_BLAST 0x00020000 /* blast all recursive servers */
#define RES_USEBSTRING 0x00040000 /* IPv6 reverse lookup with byte #define RES_USEBSTRING 0x00040000 /* IPv6 reverse lookup with byte
strings */ strings */
#define RES_NOIP6DOTINT 0x00080000 /* Do not use .ip6.int in IPv6
reverse lookup */
#define RES_USE_EDNS0 0x00100000 /* Use EDNS0. */ #define RES_USE_EDNS0 0x00100000 /* Use EDNS0. */
#define RES_SNGLKUP 0x00200000 /* one outstanding request at a time */ #define RES_SNGLKUP 0x00200000 /* one outstanding request at a time */
#define RES_SNGLKUPREOP 0x00400000 /* -"-, but open new socket for each #define RES_SNGLKUPREOP 0x00400000 /* -"-, but open new socket for each
@ -209,7 +207,7 @@ struct res_sym {
#define RES_NOTLDQUERY 0x01000000 /* Do not look up unqualified name #define RES_NOTLDQUERY 0x01000000 /* Do not look up unqualified name
as a TLD. */ as a TLD. */
#define RES_DEFAULT (RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT) #define RES_DEFAULT (RES_RECURSE|RES_DEFNAMES|RES_DNSRCH)
/* /*
* Resolver "pfcode" values. Used by dig. * Resolver "pfcode" values. Used by dig.