[PATCH REBASED] net: reset nb->data per dns record lookup loop

[PATCH REBASED] net: reset nb->data per dns record lookup loop

[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,

Signed-off-by: Josef Bacik <jbacik@fb.com>
---
-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)))
-- 
2.1.0

Re: [PATCH REBASED] net: reset nb->data per dns record lookup loop

[Andrei Borzenkov]

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 <jbacik@fb.com>
> ---
> -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)))
>