diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2016-08-30 15:22:04 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2016-08-31 17:44:13 +0200 |
| commit | 4f5059306be98748d2bede9cb5f011e889c81805 (patch) | |
| tree | c0035d2ed15877fa69f3c7b234bcd6f20e88a29f /libnm-core/nm-connection.c | |
| parent | 9740a5903522cc2ccbab335be5480caa669b34de (diff) | |
Revert "libnm-core/team: normalize invalid config to NULL"
It's better to fail the validation of any invalid configuration
instead of silently ignoring it.
This reverts commit 476810c29016d569ac3885542a6c91e7af8a7f6d.
(cherry picked from commit 39ad134b0ca1918084b2b1fc5856cc0b7a6becfc)
Diffstat (limited to 'libnm-core/nm-connection.c')
| -rw-r--r-- | libnm-core/nm-connection.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index f39d41c58e..57f964095e 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -28,7 +28,6 @@ #include "nm-connection.h" #include "nm-connection-private.h" #include "nm-utils.h" -#include "nm-utils-private.h" #include "nm-setting-private.h" #include "nm-core-internal.h" @@ -916,7 +915,7 @@ _normalize_team_config (NMConnection *self, GHashTable *parameters) if (s_team) { const char *config = nm_setting_team_get_config (s_team); - if (config && !_nm_utils_check_valid_json (config, NULL)) { + if (config && !*config) { g_object_set (s_team, NM_SETTING_TEAM_CONFIG, NULL, NULL); return TRUE; } @@ -932,7 +931,7 @@ _normalize_team_port_config (NMConnection *self, GHashTable *parameters) if (s_team_port) { const char *config = nm_setting_team_port_get_config (s_team_port); - if (config && !_nm_utils_check_valid_json (config, NULL)) { + if (config && !*config) { g_object_set (s_team_port, NM_SETTING_TEAM_PORT_CONFIG, NULL, NULL); return TRUE; } |