summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2014-07-08 14:20:40 +0200
committerThomas Haller <thaller@redhat.com>2014-08-22 15:24:30 +0200
commit686e912b82405151566cd4deae9926196d09c79e (patch)
treebbb3dbefdd808d5dea4ddb8e6727b722cd88aea9
parent92d82866602067ece1f55e245c0f7061375f9888 (diff)
downloadNetworkManager-686e912b82405151566cd4deae9926196d09c79e.tar.gz
ifcfg-rh: remove verify() connection during reading
At the end of reading the connection, reader calls nm_connection_normalize() to normalize the connection. Normalization inplicitly verifies the connection. Doing a verify along the way is not needed and even harmful. Soon further checks will be added that make verify() fail, but normalize() can fix the connection. So, while reading, we might actually have an invalid connection, that will be normalized as last step. Signed-off-by: Thomas Haller <thaller@redhat.com>
-rw-r--r--src/settings/plugins/ifcfg-rh/reader.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c
index c49d052d7a..e95bcb4226 100644
--- a/src/settings/plugins/ifcfg-rh/reader.c
+++ b/src/settings/plugins/ifcfg-rh/reader.c
@@ -3802,11 +3802,6 @@ wireless_connection_from_ifcfg (const char *file,
}
nm_connection_add_setting (connection, con_setting);
- if (!nm_connection_verify (connection, error)) {
- g_object_unref (connection);
- return NULL;
- }
-
return connection;
}
@@ -4020,11 +4015,6 @@ wired_connection_from_ifcfg (const char *file,
if (s_8021x)
nm_connection_add_setting (connection, NM_SETTING (s_8021x));
- if (!nm_connection_verify (connection, error)) {
- g_object_unref (connection);
- return NULL;
- }
-
return connection;
}
@@ -4183,11 +4173,6 @@ infiniband_connection_from_ifcfg (const char *file,
}
nm_connection_add_setting (connection, infiniband_setting);
- if (!nm_connection_verify (connection, error)) {
- g_object_unref (connection);
- return NULL;
- }
-
return connection;
}
@@ -4308,11 +4293,6 @@ bond_connection_from_ifcfg (const char *file,
if (s_8021x)
nm_connection_add_setting (connection, NM_SETTING (s_8021x));
- if (!nm_connection_verify (connection, error)) {
- g_object_unref (connection);
- return NULL;
- }
-
return connection;
}
@@ -4419,11 +4399,6 @@ team_connection_from_ifcfg (const char *file,
if (s_8021x)
nm_connection_add_setting (connection, NM_SETTING (s_8021x));
- if (!nm_connection_verify (connection, error)) {
- g_object_unref (connection);
- return NULL;
- }
-
return connection;
}
@@ -4604,11 +4579,6 @@ bridge_connection_from_ifcfg (const char *file,
}
nm_connection_add_setting (connection, bridge_setting);
- if (!nm_connection_verify (connection, error)) {
- g_object_unref (connection);
- return NULL;
- }
-
return connection;
}
@@ -4921,10 +4891,6 @@ vlan_connection_from_ifcfg (const char *file,
if (s_8021x)
nm_connection_add_setting (connection, NM_SETTING (s_8021x));
- if (!nm_connection_verify (connection, error)) {
- g_object_unref (connection);
- return NULL;
- }
return connection;
}