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

ifcfg-rh: correct handling of BRIDGE and VLAN unmanaged connections (rh #619863)

Browse source 
For those ifcfg files that do have HWADDR and thus can have their
device be unmanaged, we want to read in a much of the connection as
possible since unmanaged devices are tracked via internal NMIfcfgConnection
objects.  For BRIDGE/VLAN ifcfg files that don't have HWADDR, we do
want to ignore them completely, but also return a useful error
message.
This commit is contained in:
Dan Williams 2010-08-09 13:15:17 -05:00
parent 5dedf06fb9
commit 46696c22ca
1 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
system-settings/plugins/ifcfg-rh/reader.c
View file

@ -3183,6 +3183,12 @@ is_wireless_device (const char *iface)
return is_wireless;
}
enum {
IGNORE_REASON_NONE = 0x00,
IGNORE_REASON_BRIDGE = 0x01,
IGNORE_REASON_VLAN = 0x02,
};
NMConnection *
connection_from_file (const char *filename,
const char *network_file, /* for unit tests only */
@ -3203,7 +3209,7 @@ connection_from_file (const char *filename,
gboolean nm_controlled = TRUE;
gboolean ip6_used = FALSE;
GError *error = NULL;
gboolean ignore_connection = FALSE;
guint32 ignore_reason = IGNORE_REASON_NONE;
g_return_val_if_fail (filename != NULL, NULL);
g_return_val_if_fail (unmanaged != NULL, NULL);
@ -3293,7 +3299,7 @@ connection_from_file (const char *filename,
if (tmp) {
g_free (tmp);
nm_controlled = FALSE;
ignore_connection = TRUE;
ignore_reason = IGNORE_REASON_BRIDGE;
}
if (nm_controlled) {
@ -3301,7 +3307,7 @@ connection_from_file (const char *filename,
if (tmp) {
g_free (tmp);
nm_controlled = FALSE;
ignore_connection = TRUE;
ignore_reason = IGNORE_REASON_VLAN;
}
}
@ -3325,14 +3331,22 @@ connection_from_file (const char *filename,
g_free (type);
/* Don't bother reading the connection fully if it's unmanaged. As a
* special-case, BRIDGE= and VLAN= connections are completely ignored so
* that ifup gets an error when it tries to ask NM about them.
*/
if (!connection || *unmanaged || ignore_connection) {
if (connection && ignore_connection) {
g_object_unref (connection);
connection = NULL;
/* Don't bother reading the connection fully if it's unmanaged or ignored */
if (!connection || *unmanaged || ignore_reason) {
if (connection && !*unmanaged) {
/* However,BRIDGE and VLAN connections that don't have HWADDR won't
* be unmanaged because the unmanaged state is keyed off HWADDR.
* They willl still be tagged 'ignore' from code that checks BRIDGE
* and VLAN above. Since they aren't marked unmanaged, kill them
* completely.
*/
if (ignore_reason) {
g_object_unref (connection);
connection = NULL;
g_set_error (&error, IFCFG_PLUGIN_ERROR, 0,
"%s connections are not yet supported",
ignore_reason == IGNORE_REASON_BRIDGE ? "Bridge" : "VLAN");
}
}
goto done;
}