system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2008-04-07 Dan Williams <dcbw@redhat.com>

Browse source 
* system-settings/plugins/ifcfg-fedora/parser.c
		- (make_ip4_setting): fix parsing of DNS servers



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3536 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-04-07 22:57:29 +00:00
parent 8650747fa7
commit dcbfae2c1e
2 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-04-07 Dan Williams <dcbw@redhat.com>
* system-settings/plugins/ifcfg-fedora/parser.c
- (make_ip4_setting): fix parsing of DNS servers
2008-04-05 Dan Williams <dcbw@redhat.com>
* Makefile.am

29
system-settings/plugins/ifcfg-fedora/parser.c
View file

@ -260,6 +260,17 @@ get_one_ip4_addr (shvarFile *ifcfg,
g_free (value);
}
#define GET_ONE_DNS(tag) \
{ \
guint32 dns = 0; \
get_one_ip4_addr (ifcfg, "DNS1", &dns, error); \
if (*error) \
goto error; \
if (dns) \
g_array_append_val (s_ip4->dns, dns); \
}
static NMSetting *
make_ip4_setting (shvarFile *ifcfg, GError **error)
{
@ -267,7 +278,6 @@ make_ip4_setting (shvarFile *ifcfg, GError **error)
char *value = NULL;
NMSettingIP4Address tmp = { 0, 0, 0 };
char *method = NM_SETTING_IP4_CONFIG_METHOD_MANUAL;
guint32 dns;
value = svGetValue (ifcfg, "BOOTPROTO");
if (value && (!g_ascii_strcasecmp (value, "bootp") || !g_ascii_strcasecmp (value, "dhcp")))
@ -305,20 +315,9 @@ done:
if (g_ascii_strcasecmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTOIP)) {
s_ip4->dns = g_array_sized_new (FALSE, TRUE, sizeof (guint32), 3);
get_one_ip4_addr (ifcfg, "DNS1", &dns, error);
if (*error)
goto error;
g_array_append_val (s_ip4->dns, dns);
get_one_ip4_addr (ifcfg, "DNS2", &dns, error);
if (*error)
goto error;
g_array_append_val (s_ip4->dns, dns);
get_one_ip4_addr (ifcfg, "DNS3", &dns, error);
if (*error)
goto error;
g_array_append_val (s_ip4->dns, dns);
GET_ONE_DNS("DNS1");
GET_ONE_DNS("DNS2");
GET_ONE_DNS("DNS3");
if (s_ip4->dns && !s_ip4->dns->len) {
g_array_free (s_ip4->dns, TRUE);