diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-06-01 15:28:43 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-06-02 12:57:52 +0200 |
| commit | 4ef8c0c90ce213303505e2eab3db4f8741ad6d94 (patch) | |
| tree | 5ea3688bc2b9c6d31880142f6923dbb5062188da | |
| parent | 900aa016b1351a9b002178aedf5834d876ff5101 (diff) | |
| download | NetworkManager-4ef8c0c90ce213303505e2eab3db4f8741ad6d94.tar.gz | |
ifcfg-rh: also read alias file for dhcp connections
Previously, if the main ifcfg file doesn't define any
static ip addresses, any alias files would be ignored.
We should also allow alias files with (pure) 'dhcp' connections,
just like initscripts do.
Reported-by: Marek Hulan <mhulan@redhat.com>
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/reader.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c index 6dcb1a3641..ccbcdb07ab 100644 --- a/src/settings/plugins/ifcfg-rh/reader.c +++ b/src/settings/plugins/ifcfg-rh/reader.c @@ -1180,16 +1180,14 @@ read_aliases (NMSettingIPConfig *s_ip4, const char *filename, const char *networ GDir *dir; char *dirname, *base; shvarFile *parsed; - NMIPAddress *base_addr; + NMIPAddress *base_addr = NULL; GError *err = NULL; g_return_if_fail (s_ip4 != NULL); g_return_if_fail (filename != NULL); - if (nm_setting_ip_config_get_num_addresses (s_ip4) == 0) - return; - - base_addr = nm_setting_ip_config_get_address (s_ip4, 0); + if (nm_setting_ip_config_get_num_addresses (s_ip4) > 0) + base_addr = nm_setting_ip_config_get_address (s_ip4, 0); dirname = g_path_get_dirname (filename); g_return_if_fail (dirname != NULL); |