From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1a1HiH-00012E-Qb for mharc-grub-devel@gnu.org; Tue, 24 Nov 2015 12:49:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1HiF-00010W-9M for grub-devel@gnu.org; Tue, 24 Nov 2015 12:49:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1HiB-0001Aj-91 for grub-devel@gnu.org; Tue, 24 Nov 2015 12:49:07 -0500 Received: from mail-lf0-x229.google.com ([2a00:1450:4010:c07::229]:33459) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1HiB-0001Ae-1S for grub-devel@gnu.org; Tue, 24 Nov 2015 12:49:03 -0500 Received: by lfaz4 with SMTP id z4so30883333lfa.0 for ; Tue, 24 Nov 2015 09:49:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-type:content-transfer-encoding; bh=14jAXxUQWvyiqDF659oBzYVk2USd3y5K++GekJvcVFw=; b=LPigIcKSXbrHjbHnZ1jSx4sWlEjUmuLPNBI+i0rZEx93Dq9gWxcr+nkMm7faUOlx/C GBWqt0XXaPOwy4PhPuzqSXKuFYXIaWQ7f9vC45k9H1jWcrnAoabreJyrguuCsgIlD2Hh 2XDRyxRMpzUb5M6uVXviFONHye8XlGM8ZRp4+zE7WOyUEucO703rJeorpH1UImV2fQpp D60a2bj2gnh0CT3B9pwk8Tn12w/XpXcf5spe9k/zBgy/xK0BD2JtNr8GOEkR30GCNuXP eXEdAnJ0/tX5N4KxU7oOhAz/omL2BR92zwbxbtuw9YmPy2pQeBw0AgtW8ApniT2DYWzU rWlA== X-Received: by 10.25.162.144 with SMTP id l138mr13806665lfe.30.1448387342105; Tue, 24 Nov 2015 09:49:02 -0800 (PST) Received: from [192.168.1.41] (ppp91-76-25-247.pppoe.mtu-net.ru. [91.76.25.247]) by smtp.gmail.com with ESMTPSA id xn8sm2721687lbb.41.2015.11.24.09.49.00 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Nov 2015 09:49:01 -0800 (PST) Subject: Re: [PATCH REBASED] net: reset nb->data per dns record lookup loop To: Josef Bacik , grub-devel@gnu.org, kernel-team@fb.com References: <1448386895-22013-1-git-send-email-jbacik@fb.com> From: Andrei Borzenkov Message-ID: <5654A30C.4040408@gmail.com> Date: Tue, 24 Nov 2015 20:49:00 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <1448386895-22013-1-git-send-email-jbacik@fb.com> Content-Type: text/plain; charset=windows-1251 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c07::229 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2015 17:49:08 -0000 24.11.2015 20:41, Josef Bacik пишет: > We were resetting nb->data every time we tried a new server, but we need to do > it every time we try for a different record, otherwise we don't end up falling > back to the A record properly. Thanks, > Applied. Thanks! > Signed-off-by: Josef Bacik > --- > -This is a rebase onto this mornings master. > > grub-core/net/dns.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c > index b7e951a..82a3307 100644 > --- a/grub-core/net/dns.c > +++ b/grub-core/net/dns.c > @@ -568,11 +568,10 @@ grub_net_dns_lookup (const char *name, > { > grub_err_t err2; > > - nb->data = nbd; > - > grub_size_t t = 0; > do > { > + nb->data = nbd; > if (servers[j].option == DNS_OPTION_IPV4 || > ((servers[j].option == DNS_OPTION_PREFER_IPV4) && (t++ == 0)) || > ((servers[j].option == DNS_OPTION_PREFER_IPV6) && (t++ == 1))) >