From patchwork Tue May 10 08:23:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 620513 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 3r3shm1WT2z9sDb for ; Tue, 10 May 2016 18:23:36 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=eMBRbKAb; 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= GTbv1lHs1RnHU4AzINEyzSyoFBk0Tj/y0RzXz5Asc5ObHmGOXSeKsqJt9EH2UO9e IDeYGq+Arm9AeRer8bDkhTQTrQVnmbtzW/IIzhAPL88Cw8FO6wbVXrBi+jP9GnxR C8TDQEwl4vp6uHrirSyHqVdjti68RHmQtHyzMXEnN1k= 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=F2kqjA LUh/rFv1KoVQPHXPx9rdM=; b=eMBRbKAbMvO8JG8+dOljwMZqv1WMttz8mH40lE ZUIgyno1MFZWv9m+dTgaW4gLZU9T8Lo2xXHom/wNypuWbs8ZFX4e/9RsqrREpupB 4q5iar+lkfFYphHrUzjOdxIXu4UZ6eqxkSG3sYXu/JiFBGJXwpusWLb3r8+YeAFE anuzI= Received: (qmail 82785 invoked by alias); 10 May 2016 08:23:30 -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 82762 invoked by uid 89); 10 May 2016 08:23:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.0 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=2016-05-10 X-HELO: mx1.redhat.com Date: Tue, 10 May 2016 10:23:24 +0200 To: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] getaddrinfo: Restore RES_USE_INET6 flag on error path [BZ #19994] User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20160510082324.D7F1F404DDEF0@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) 2016-05-10 Florian Weimer [BZ #19994] * sysdeps/posix/getaddrinfo.c (gethosts): Restore RES_USE_INET6 flag in _res.options. diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index fed2d3b..c670a98 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -240,6 +240,7 @@ convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, 2 * tmpbuflen); \ if (newp == NULL) \ { \ + _res.options |= old_res_options & RES_USE_INET6; \ result = -EAI_MEMORY; \ goto free_and_return; \ } \