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

ifcfg-rh: minor tweaks to previous patch

Browse source
This commit is contained in:
Dan Winship 2013-08-22 08:57:07 -04:00
parent dbf9c42578
commit f201a248c3
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -589,8 +589,8 @@ parse_ip6_address (const char *value,
return TRUE;
}
static gchar *
get_numbered_tag (gchar *tag_name, gint32 which)
static char *
get_numbered_tag (char *tag_name, int which)
{
if (which == -1)
return g_strdup (tag_name);
@ -600,10 +600,10 @@ get_numbered_tag (gchar *tag_name, gint32 which)
static gboolean
is_any_ip4_address_defined (shvarFile *ifcfg)
{
gint32 i;
int i;
for (i = -1; i <= 2; i++) {
gchar *tag;
char *tag;
char *value;
tag = get_numbered_tag ("IPADDR", i);
@ -1341,9 +1341,9 @@ make_ip4_setting (shvarFile *ifcfg,
g_free (value);
}
if (!value || bootproto_none) {
/* If there is no BOOTPROTO, no IPADDR, no PREFIX, no NETMASK, but
* valid IPv6 configuration, assume that IPv4 is disabled. Otherwise,
* if there is no IPv6 configuration, assume DHCP is to be used.
/* If there is no BOOTPROTO (or BOOTPROTO=none), no IPADDR, no PREFIX,
* no NETMASK, but valid IPv6 configuration, assume that IPv4 is disabled.
* Otherwise, if there is no IPv6 configuration, assume DHCP is to be used.
* Happens with minimal ifcfg files like the following that anaconda
* sometimes used to write out:
*