This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.24-255-g7ec47a8
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 7 Oct 2016 15:46:16 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.24-255-g7ec47a8
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 7ec47a85d865e7bc43358633a0f960921dbfc373 (commit)
via bfbd1de1590ae3f1a098d0166631d027f33565e9 (commit)
from 314ba75e4a26f7147c757a10b07a62ff113409aa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7ec47a85d865e7bc43358633a0f960921dbfc373
commit 7ec47a85d865e7bc43358633a0f960921dbfc373
Author: Florian Weimer <fweimer@redhat.com>
Date: Fri Oct 7 13:55:47 2016 +0200
resolv: Remove RES_NOIP6DOTINT and its implementation
diff --git a/ChangeLog b/ChangeLog
index 942f9e0..361277e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
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>
+
resolv: Deprecate unimplemented flags.
* misc/sys/cdefs.h (__glibc_macro_warning1)
(__glibc_macro_warning): Define.
diff --git a/NEWS b/NEWS
index be66f23..49b9180 100644
--- a/NEWS
+++ b/NEWS
@@ -59,6 +59,11 @@ Version 2.25
for the Linux quota interface which predates kernel version 2.4.22 has
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
in the <resolv.h> header file have been deprecated. They were already
unimplemented.
diff --git a/resolv/gethnamaddr.c b/resolv/gethnamaddr.c
index 9ad2c30..1b81ca8 100644
--- a/resolv/gethnamaddr.c
+++ b/resolv/gethnamaddr.c
@@ -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,
&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 (buf.buf != orig_buf)
free (buf.buf);
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
index 5f9e357..b6245ad 100644
--- a/resolv/nss_dns/dns-host.c
+++ b/resolv/nss_dns/dns-host.c
@@ -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,
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)
{
*h_errnop = h_errno;
diff --git a/resolv/res_debug.c b/resolv/res_debug.c
index 825e8a6..0404646 100644
--- a/resolv/res_debug.c
+++ b/resolv/res_debug.c
@@ -559,7 +559,6 @@ p_option(u_long option) {
case RES_ROTATE: return "rotate";
case RES_BLAST: return "blast";
case RES_USEBSTRING: return "ip6-bytestring";
- case RES_NOIP6DOTINT: return "no-ip6-dotint";
case RES_USE_EDNS0: return "edns0";
case RES_SNGLKUP: return "single-request";
case RES_SNGLKUPREOP: return "single-request-reopen";
diff --git a/resolv/res_init.c b/resolv/res_init.c
index 1cfa4e6..12afb9e 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -439,8 +439,6 @@ res_setoptions(res_state statp, const char *options, const char *source) {
#define STRnLEN(str) str, sizeof (str) - 1
{ STRnLEN ("inet6"), 0, RES_USE_INET6 },
{ 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 ("edns0"), 0, RES_USE_EDNS0 },
{ STRnLEN ("single-request-reopen"), 0, RES_SNGLKUPREOP },
diff --git a/resolv/resolv.h b/resolv/resolv.h
index 9146258..11a7fed 100644
--- a/resolv/resolv.h
+++ b/resolv/resolv.h
@@ -199,8 +199,6 @@ struct res_sym {
#define RES_BLAST 0x00020000 /* blast all recursive servers */
#define RES_USEBSTRING 0x00040000 /* IPv6 reverse lookup with byte
strings */
-#define RES_NOIP6DOTINT 0x00080000 /* Do not use .ip6.int in IPv6
- reverse lookup */
#define RES_USE_EDNS0 0x00100000 /* Use EDNS0. */
#define RES_SNGLKUP 0x00200000 /* one outstanding request at a time */
#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
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.
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=bfbd1de1590ae3f1a098d0166631d027f33565e9
commit bfbd1de1590ae3f1a098d0166631d027f33565e9
Author: Florian Weimer <fweimer@redhat.com>
Date: Fri Oct 7 17:41:45 2016 +0200
resolv: Deprecate unimplemented flags
RES_AAONLY, RES_PRIMARY, RES_NOCHECKNAME, RES_KEEPTSIG result
in compile-time warnings. Some of these flags are still used in
applications.
diff --git a/ChangeLog b/ChangeLog
index 549acfd..942f9e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2016-10-07 Florian Weimer <fweimer@redhat.com>
+
+ resolv: Deprecate unimplemented flags.
+ * misc/sys/cdefs.h (__glibc_macro_warning1)
+ (__glibc_macro_warning): Define.
+ * resolv/resolv.h (RES_AAONLY, RES_PRIMARY, RES_NOCHECKNAME)
+ (RES_KEEPTSIG): Mark as deprecated.
+ * resolv/res_debug.c (p_option): Remove RES_AAONLY, RES_PRIMARY,
+ RES_NOCHECKNAME, RES_KEEPTSIG.
+ * resolv/res_init.c (res_setoptions): Remove RES_NOCHECKNAME handling.
+
2016-10-07 Stefan Liebler <stli@linux.vnet.ibm.com>
* nptl/pt-longjmp.c (DEFINE_LONGJMP): Use libc_ifunc macro.
diff --git a/NEWS b/NEWS
index b077d0a..be66f23 100644
--- a/NEWS
+++ b/NEWS
@@ -59,6 +59,10 @@ Version 2.25
for the Linux quota interface which predates kernel version 2.4.22 has
been removed.
+* The flags RES_AAONLY, RES_PRIMARY, RES_NOCHECKNAME, RES_KEEPTSIG defined
+ in the <resolv.h> header file have been deprecated. They were already
+ unimplemented.
+
* 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
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index 935a94b..50e00e6 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -472,4 +472,14 @@
# endif
#endif
+/* __glibc_macro_warning (MESSAGE) issues warning MESSAGE. This is
+ intended for use in preprocessor macros. */
+#if __GNUC_PREREQ (4,8)
+# define __glibc_macro_warning1(message) _Pragma (#message)
+# define __glibc_macro_warning(message) \
+ __glibc_macro_warning1 (GCC warning message)
+#else
+# define __glibc_macro_warning(msg)
+#endif
+
#endif /* sys/cdefs.h */
diff --git a/resolv/res_debug.c b/resolv/res_debug.c
index 9b33e19..825e8a6 100644
--- a/resolv/res_debug.c
+++ b/resolv/res_debug.c
@@ -546,9 +546,7 @@ p_option(u_long option) {
switch (option) {
case RES_INIT: return "init";
case RES_DEBUG: return "debug";
- case RES_AAONLY: return "aaonly(unimpl)";
case RES_USEVC: return "use-vc";
- case RES_PRIMARY: return "primry(unimpl)";
case RES_IGNTC: return "igntc";
case RES_RECURSE: return "recurs";
case RES_DEFNAMES: return "defnam";
@@ -559,8 +557,6 @@ p_option(u_long option) {
case RES_NOALIASES: return "noaliases";
case RES_USE_INET6: return "inet6";
case RES_ROTATE: return "rotate";
- case RES_NOCHECKNAME: return "no-check-names(unimpl)";
- case RES_KEEPTSIG: return "keeptsig(unimpl)";
case RES_BLAST: return "blast";
case RES_USEBSTRING: return "ip6-bytestring";
case RES_NOIP6DOTINT: return "no-ip6-dotint";
diff --git a/resolv/res_init.c b/resolv/res_init.c
index 0a01fd5..1cfa4e6 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -442,7 +442,6 @@ res_setoptions(res_state statp, const char *options, const char *source) {
{ STRnLEN ("no-ip6-dotint"), 0, RES_NOIP6DOTINT },
{ STRnLEN ("ip6-dotint"), 1, ~RES_NOIP6DOTINT },
{ STRnLEN ("rotate"), 0, RES_ROTATE },
- { STRnLEN ("no-check-names"), 0, RES_NOCHECKNAME },
{ STRnLEN ("edns0"), 0, RES_USE_EDNS0 },
{ STRnLEN ("single-request-reopen"), 0, RES_SNGLKUPREOP },
{ STRnLEN ("single-request"), 0, RES_SNGLKUP },
diff --git a/resolv/resolv.h b/resolv/resolv.h
index 58c3c38..9146258 100644
--- a/resolv/resolv.h
+++ b/resolv/resolv.h
@@ -177,9 +177,11 @@ struct res_sym {
*/
#define RES_INIT 0x00000001 /* address initialized */
#define RES_DEBUG 0x00000002 /* print debug messages */
-#define RES_AAONLY 0x00000004 /* authoritative answers only (!IMPL)*/
+#define RES_AAONLY \
+ __glibc_macro_warning ("RES_AAONLY is deprecated") 0x00000004
#define RES_USEVC 0x00000008 /* use virtual circuit */
-#define RES_PRIMARY 0x00000010 /* query primary server only (!IMPL) */
+#define RES_PRIMARY \
+ __glibc_macro_warning ("RES_PRIMARY is deprecated") 0x00000010
#define RES_IGNTC 0x00000020 /* ignore trucation errors */
#define RES_RECURSE 0x00000040 /* recursion desired */
#define RES_DEFNAMES 0x00000080 /* use default domain name */
@@ -190,8 +192,10 @@ struct res_sym {
#define RES_NOALIASES 0x00001000 /* shuts off HOSTALIASES feature */
#define RES_USE_INET6 0x00002000 /* use/map IPv6 in gethostbyname() */
#define RES_ROTATE 0x00004000 /* rotate ns list after each query */
-#define RES_NOCHECKNAME 0x00008000 /* do not check names for sanity (!IMPL) */
-#define RES_KEEPTSIG 0x00010000 /* do not strip TSIG records */
+#define RES_NOCHECKNAME \
+ __glibc_macro_warning ("RES_NOCHECKNAME is deprecated") 0x00008000
+#define RES_KEEPTSIG \
+ __glibc_macro_warning ("RES_KEEPTSIG is deprecated") 0x00010000
#define RES_BLAST 0x00020000 /* blast all recursive servers */
#define RES_USEBSTRING 0x00040000 /* IPv6 reverse lookup with byte
strings */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 22 ++++++++++++++++++++++
NEWS | 9 +++++++++
misc/sys/cdefs.h | 10 ++++++++++
resolv/gethnamaddr.c | 6 ------
resolv/nss_dns/dns-host.c | 8 --------
resolv/res_debug.c | 5 -----
resolv/res_init.c | 3 ---
resolv/resolv.h | 16 +++++++++-------
8 files changed, 50 insertions(+), 29 deletions(-)
hooks/post-receive
--
GNU C Library master sources