vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/net/dns.c (grub_cmd_nslookup): Use configured DNS servers if

Browse source 
none is explicitly specified.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-21 00:14:51 +02:00
parent 9eb832c365
commit 9b55efe09a
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-06-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/net/dns.c (grub_cmd_nslookup): Use configured DNS servers if
none is explicitly specified.
2012-06-20 Vladimir Serbinenko <phcoder@gmail.com> 2012-06-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/net/dns.c (grub_net_add_dns_server): Don't erase old servers * grub-core/net/dns.c (grub_net_add_dns_server): Don't erase old servers

21
grub-core/net/dns.c
View file

@ -604,18 +604,23 @@ grub_cmd_nslookup (struct grub_command *cmd __attribute__ ((unused)),
int argc, char **args) int argc, char **args)
{ {
grub_err_t err; grub_err_t err;
struct grub_net_network_level_address server;
grub_size_t naddresses, i; grub_size_t naddresses, i;
struct grub_net_network_level_address *addresses; struct grub_net_network_level_address *addresses;
if (argc != 2) if (argc != 2 && argc != 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("two arguments expected")); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("two arguments expected"));
err = grub_net_resolve_address (args[1], &server); if (argc == 2)
if (err) {
return err; struct grub_net_network_level_address server;
err = grub_net_resolve_address (args[1], &server);
if (err)
return err;
err = grub_net_dns_lookup (args[0], &server, 1, &naddresses,
&addresses, 0);
}
else
err = grub_net_dns_lookup (args[0], dns_servers, dns_nservers, &naddresses,
&addresses, 0);
err = grub_net_dns_lookup (args[0], &server, 1, &naddresses, &addresses, 0);
if (err)
return err;
for (i = 0; i < naddresses; i++) for (i = 0; i < naddresses; i++)
{ {
char buf[GRUB_NET_MAX_STR_ADDR_LEN]; char buf[GRUB_NET_MAX_STR_ADDR_LEN];