fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 16:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg: stack-allocate tag for DNS value lookup

Browse source
This commit is contained in:
Thomas Haller 2017-02-21 00:57:38 +01:00
parent 03eab8bf92
commit 601700dedf
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -1152,9 +1152,9 @@ make_ip4_setting (shvarFile *ifcfg,
* Pick up just IPv4 addresses (IPv6 addresses are taken by make_ip6_setting())
*/
for (i = 1; i <= 10; i++) {
char *tag;
char tag[256];
tag = g_strdup_printf ("DNS%u", i);
numbered_tag (tag, "DNS", i);
value = svGetValueString (ifcfg, tag);
if (value) {
if (nm_utils_ipaddr_valid (AF_INET, value)) {
@ -1164,15 +1164,12 @@ make_ip4_setting (shvarFile *ifcfg,
/* Ignore IPv6 addresses */
} else {
PARSE_WARNING ("invalid DNS server address %s", value);
g_free (tag);
g_free (value);
goto done;
}
g_free (value);
}
g_free (tag);
}
/* DNS searches */
@ -1633,13 +1630,13 @@ make_ip6_setting (shvarFile *ifcfg,
* Pick up just IPv6 addresses (IPv4 addresses are taken by make_ip4_setting())
*/
for (i = 1; i <= 10; i++) {
char *tag;
char tag[256];
tag = g_strdup_printf ("DNS%u", i);
numbered_tag (tag, "DNS", i);
value = svGetValueString (ifcfg, tag);
if (!value) {
g_free (tag);
break; /* all done */
/* all done */
break;
}
if (nm_utils_ipaddr_valid (AF_INET6, value)) {
@ -1649,12 +1646,10 @@ make_ip6_setting (shvarFile *ifcfg,
/* Ignore IPv4 addresses */
} else {
PARSE_WARNING ("invalid DNS server address %s", value);
g_free (tag);
g_free (value);
goto error;
}
g_free (tag);
g_free (value);
}
@ -3696,7 +3691,7 @@ wireless_connection_from_ifcfg (const char *file,
printable_ssid = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL),
g_bytes_get_size (ssid));
} else
printable_ssid = g_strdup_printf ("unmanaged");
printable_ssid = g_strdup ("unmanaged");
mode = nm_setting_wireless_get_mode (NM_SETTING_WIRELESS (wireless_setting));
if (mode && !strcmp (mode, "adhoc"))