diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-12-31 19:08:39 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-12-31 19:08:39 +0100 |
| commit | bbe989ee87ee81f45a4f6450bff468f7a193e79e (patch) | |
| tree | b7a81918665c0388ad6b9f0c52a97775ad6c69f9 | |
| parent | b76e065991ec01299225d9da90a627ebe6c1ac97 (diff) | |
| download | glibc-bbe989ee87ee81f45a4f6450bff468f7a193e79e.tar.gz glibc-bbe989ee87ee81f45a4f6450bff468f7a193e79e.tar.xz glibc-bbe989ee87ee81f45a4f6450bff468f7a193e79e.zip | |
resolv: Deprecate RES_BLAST
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | resolv/res_debug.c | 1 | ||||
| -rw-r--r-- | resolv/res_send.c | 3 | ||||
| -rw-r--r-- | resolv/resolv.h | 3 |
5 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index daf45f5dac..d219e5432b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-12-31 Florian Weimer <fweimer@redhat.com> + + * resolv/resolv.h (RES_BLAST): Deprecate. + * resolv/res_debug.c (p_option): Remove RES_BLAST. + * resolv/res_send.c (__libc_res_nsend): Remove vestigial reference + to RES_BLAST. + 2016-12-27 Florian Weimer <fweimer@redhat.com> [BZ #19582] diff --git a/NEWS b/NEWS index af9b589ccf..994ff5940d 100644 --- a/NEWS +++ b/NEWS @@ -144,9 +144,9 @@ Version 2.25 backwards-incompatible DNS extension which was never deployed on the Internet. -* The flags RES_AAONLY, RES_PRIMARY, RES_NOCHECKNAME, RES_KEEPTSIG defined - in the <resolv.h> header file have been deprecated. They were already - unimplemented. +* The flags RES_AAONLY, RES_PRIMARY, RES_NOCHECKNAME, RES_KEEPTSIG, + RES_BLAST defined 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 diff --git a/resolv/res_debug.c b/resolv/res_debug.c index 33891878d8..12059c229b 100644 --- a/resolv/res_debug.c +++ b/resolv/res_debug.c @@ -558,7 +558,6 @@ p_option(u_long option) { case RES_NOALIASES: return "noaliases"; case DEPRECATED_RES_USE_INET6: return "inet6"; case RES_ROTATE: return "rotate"; - case RES_BLAST: return "blast"; case RES_USE_EDNS0: return "edns0"; case RES_SNGLKUP: return "single-request"; case RES_SNGLKUPREOP: return "single-request-reopen"; diff --git a/resolv/res_send.c b/resolv/res_send.c index cc2a7de886..1839225605 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -424,8 +424,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, * Some resolvers want to even out the load on their nameservers. * Note that RES_BLAST overrides RES_ROTATE. */ - if (__builtin_expect ((statp->options & RES_ROTATE) != 0, 0) && - (statp->options & RES_BLAST) == 0) { + if (__builtin_expect ((statp->options & RES_ROTATE) != 0, 0)) { struct sockaddr_in ina; struct sockaddr_in6 *inp; int lastns = statp->nscount - 1; diff --git a/resolv/resolv.h b/resolv/resolv.h index ddc022091c..7809e2eb19 100644 --- a/resolv/resolv.h +++ b/resolv/resolv.h @@ -197,7 +197,8 @@ struct res_sym { __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_BLAST \ + __glibc_macro_warning ("RES_BLAST is deprecated") 0x00020000 #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 |