From patchwork Sat Dec 31 19:33:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 709959 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3trYQy3t1vz9sCG for ; Sun, 1 Jan 2017 06:33:14 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="vpMP/74J"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; q=dns; s=default; b= HjAhqpkQ3zL9y/b0IlO9YRuTOn1/04XULJtJQpS3ANoAS4F6TxxoXt3xWPb5h5r7 hysgQTttG2bAH38EQS3hyoRCodkwOZvKxhYkJxX6aAaNqP7J5fGXcFWCHirybXAV JnS7vvISnEepfOoei5w8Z8nOsqkHX+gyQS0po15IEWk= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; s=default; bh=y4kN0U +HLZnkSFVC2LXqfnoTb8w=; b=vpMP/74J+cEq2g8UBIkTJ9TsNeqYVLrsHq426R XqQn8UChcZN2Deu9/YN7Iw3SrV7Nr5DqSbURnwNWueQTMfPwltTLymBWNQPcUvj5 X3CKriYFB0TOBkaMmrCxsMYDEPZbDFD6BniAlQKAQnvye2UUSj5k+u87vwHML6n2 w7k6E= Received: (qmail 9055 invoked by alias); 31 Dec 2016 19:33:07 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 9046 invoked by uid 89); 31 Dec 2016 19:33:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-5.1 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=blast, ina, 1978, sk:__glibc X-HELO: mx1.redhat.com Date: Sat, 31 Dec 2016 20:33:03 +0100 To: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] resolv: Deprecate RES_BLAST User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20161231193303.475804299C70C@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) 2016-12-31 Florian Weimer * 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. diff --git a/NEWS b/NEWS index af9b589..994ff59 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 header file have been deprecated. They were already - unimplemented. +* The flags RES_AAONLY, RES_PRIMARY, RES_NOCHECKNAME, RES_KEEPTSIG, + RES_BLAST defined in the 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 3389187..12059c2 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 cc2a7de..1839225 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 ddc0220..7809e2e 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