From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id 4E6473860C35 for ; Tue, 10 Nov 2020 16:02:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4E6473860C35 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-326-NoEGjKIjMMyGCwJ7nQBcqg-1; Tue, 10 Nov 2020 11:02:24 -0500 X-MC-Unique: NoEGjKIjMMyGCwJ7nQBcqg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F2D2210199AA for ; Tue, 10 Nov 2020 16:02:22 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-113-222.ams2.redhat.com [10.36.113.222]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 65D0E5C22D for ; Tue, 10 Nov 2020 16:02:22 +0000 (UTC) From: Florian Weimer To: libc-stable@sourceware.org Subject: [2.32 COMMITTED] support: Provide a way to clear the RA bit in DNS server responses Date: Tue, 10 Nov 2020 17:02:20 +0100 Message-ID: <875z6db3oz.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2020 16:02:38 -0000 (cherry picked from commit 08443b19965f48862b02c2fd7b33a39d66daf2ff) --- support/resolv_test.c | 4 +++- support/resolv_test.h | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/support/resolv_test.c b/support/resolv_test.c index e343c4b516..9878a040a3 100644 --- a/support/resolv_test.c +++ b/support/resolv_test.c @@ -181,7 +181,9 @@ resolv_response_init (struct resolv_response_builder *b, b->buffer[2] |= b->query_buffer[2] & 0x01; /* Copy the RD bit. */ if (flags.tc) b->buffer[2] |= 0x02; - b->buffer[3] = 0x80 | flags.rcode; /* Always set RA. */ + b->buffer[3] = flags.rcode; + if (!flags.clear_ra) + b->buffer[3] |= 0x80; if (flags.ad) b->buffer[3] |= 0x20; diff --git a/support/resolv_test.h b/support/resolv_test.h index c46de32ff4..31a5c1c3e7 100644 --- a/support/resolv_test.h +++ b/support/resolv_test.h @@ -148,6 +148,10 @@ struct resolv_response_flags /* If true, the AD (authenticated data) flag will be set. */ bool ad; + /* If true, do not set the RA (recursion available) flag in the + response. */ + bool clear_ra; + /* Initial section count values. Can be used to artificially increase the counts, for malformed packet testing.*/ unsigned short qdcount; -- Red Hat GmbH, https://de.redhat.com/ , Registered seat: Grasbrunn, Commercial register: Amtsgericht Muenchen, HRB 153243, Managing Directors: Charles Cachera, Brian Klemm, Laurie Krebs, Michael O'Neill