fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 04:50:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2008-08-27 Dan Williams <dcbw@redhat.com>

Browse source 
* system-settings/plugins/ifcfg-fedora/reader.c
		- (make_ip4_setting): use DOMAIN not SEARCH (rh #459370)



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4022 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-08-27 19:43:15 +00:00
parent 17af879e9b
commit b7f8b8f800
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-08-27 Dan Williams <dcbw@redhat.com>
* system-settings/plugins/ifcfg-fedora/reader.c
- (make_ip4_setting): use DOMAIN not SEARCH (rh #459370)
2008-08-27 Dan Williams <dcbw@redhat.com>
Ensure zombie children get cleaned up. To get notifications when children

19
system-settings/plugins/ifcfg-fedora/reader.c
View file

@ -269,7 +269,7 @@ make_ip4_setting (shvarFile *ifcfg, GError **error)
}
/* DNS searches */
value = svGetValue (ifcfg, "SEARCH");
value = svGetValue (ifcfg, "DOMAIN");
if (value) {
char **searches = NULL;
@ -283,6 +283,23 @@ make_ip4_setting (shvarFile *ifcfg, GError **error)
g_free (value);
}
/* Legacy value NM used for a while but is incorrect (rh #459370) */
if (!g_slist_length (s_ip4->dns_search)) {
value = svGetValue (ifcfg, "SEARCH");
if (value) {
char **searches = NULL;
searches = g_strsplit (value, " ", 0);
if (searches) {
char **item;
for (item = searches; *item; item++)
s_ip4->dns_search = g_slist_append (s_ip4->dns_search, *item);
g_free (searches);
}
g_free (value);
}
}
return NM_SETTING (s_ip4);
error: