Browse Source

ask for NS if DHCP server didn't give any

r24555
tags/1.08
Joshua Kwan 17 years ago
parent
commit
55fd7e2964
2 changed files with 18 additions and 2 deletions
  1. +4
    -2
      debian/changelog
  2. +14
    -0
      dhcp.c

+ 4
- 2
debian/changelog View File

@@ -1,12 +1,14 @@
netcfg (1.08) UNRELEASED; urgency=low

* Joshua Kwan
- Fix adhoc -> ad-hoc typo in dhcp.c. (closes: #282407)
- Fix adhoc -> ad-hoc typo in dhcp.c. closes: #282407, #283861
- Ask for nameserver information if the DHCP server did not provide
any. closes: #281924
* Christian Perrier
- Add a note to translators about the maximum length of
individual Choices translations for Select templates

-- Joshua Kwan <joshk@triplehelix.org> Mon, 22 Nov 2004 15:40:19 -0800
-- Joshua Kwan <joshk@triplehelix.org> Fri, 24 Dec 2004 00:22:31 -0800

netcfg (1.07) unstable; urgency=high



+ 14
- 0
dhcp.c View File

@@ -417,6 +417,20 @@ int netcfg_activate_dhcp (struct debconfclient *client)
have_domain = 1;
}

/* Make sure we have NS going if the DHCP server didn't serve it up */
if (resolv_conf_entries() == 0)
{
char *nameservers = NULL;
if (netcfg_get_nameservers (client, &nameservers) == GO_BACK)
{
state = DHCP_OPTIONS;
break;
}

netcfg_nameservers_to_array (nameservers, nameserver_array);
}
state = HOSTNAME;
}
break;


Loading…
Cancel
Save