colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifcfg-rh: require connections to be fully normalized for writing

Browse Source
This commit is contained in:
Thomas Haller
2017-03-01 14:07:12 +01:00
parent b4594af55e
commit e0252e7a75
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
View File

@@ -2726,7 +2726,7 @@ write_connection (NMConnection *connection,
gboolean wired = FALSE; gboolean wired = FALSE;
nm_assert (NM_IS_CONNECTION (connection)); nm_assert (NM_IS_CONNECTION (connection));
nm_assert (nm_connection_verify (connection, NULL)); nm_assert (_nm_connection_verify (connection, NULL) == NM_SETTING_VERIFY_SUCCESS);
nm_assert (!out_reread || !*out_reread); nm_assert (!out_reread || !*out_reread);
if (!writer_can_write_connection (connection, error)) if (!writer_can_write_connection (connection, error))

7
src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
View File

@@ -115,7 +115,7 @@ _assert_reread_same_FIXME (NMConnection *connection, NMConnection *reread)
#define _writer_update_connection_reread(connection, ifcfg_dir, filename, out_reread, out_reread_same) \ #define _writer_update_connection_reread(connection, ifcfg_dir, filename, out_reread, out_reread_same) \
G_STMT_START { \ G_STMT_START { \
NMConnection *_connection = (connection); \ gs_unref_object NMConnection *_connection = nmtst_connection_duplicate_and_normalize (connection); \
NMConnection **_out_reread = (out_reread); \ NMConnection **_out_reread = (out_reread); \
gboolean *_out_reread_same = (out_reread_same); \ gboolean *_out_reread_same = (out_reread_same); \
const char *_ifcfg_dir = (ifcfg_dir); \ const char *_ifcfg_dir = (ifcfg_dir); \
@@ -266,6 +266,7 @@ _writer_new_connection_fail (NMConnection *connection,
const char *ifcfg_dir, const char *ifcfg_dir,
GError **error) GError **error)
{ {
gs_unref_object NMConnection *connection_normalized = NULL;
gs_unref_object NMConnection *reread = NULL; gs_unref_object NMConnection *reread = NULL;
gboolean success; gboolean success;
GError *local = NULL; GError *local = NULL;
@@ -274,7 +275,9 @@ _writer_new_connection_fail (NMConnection *connection,
g_assert (NM_IS_CONNECTION (connection)); g_assert (NM_IS_CONNECTION (connection));
g_assert (ifcfg_dir); g_assert (ifcfg_dir);
success = writer_new_connection (connection, connection_normalized = nmtst_connection_duplicate_and_normalize (connection);
success = writer_new_connection (connection_normalized,
ifcfg_dir, ifcfg_dir,
&filename, &filename,
&reread, &reread,