diff options
Diffstat (limited to 'src/core/settings')
11 files changed, 65 insertions, 18 deletions
diff --git a/src/core/settings/nm-settings-connection.c b/src/core/settings/nm-settings-connection.c index 176cc2c2..459c60ad 100644 --- a/src/core/settings/nm-settings-connection.c +++ b/src/core/settings/nm-settings-connection.c @@ -226,6 +226,29 @@ static guint _get_seen_bssids(NMSettingsConnection *self, /*****************************************************************************/ +char * +nm_settings_connection_persist_mode_to_string(NMSettingsConnectionPersistMode mode) +{ + switch (mode) { + case NM_SETTINGS_CONNECTION_PERSIST_MODE_IN_MEMORY: + return "in-memory"; + case NM_SETTINGS_CONNECTION_PERSIST_MODE_IN_MEMORY_DETACHED: + return "in-memory-detached"; + case NM_SETTINGS_CONNECTION_PERSIST_MODE_IN_MEMORY_ONLY: + return "in-memory-only"; + case NM_SETTINGS_CONNECTION_PERSIST_MODE_KEEP: + return "keep"; + case NM_SETTINGS_CONNECTION_PERSIST_MODE_NO_PERSIST: + return "no-persist"; + case NM_SETTINGS_CONNECTION_PERSIST_MODE_TO_DISK: + return "to-disk"; + } + + return nm_assert_unreachable_val(NULL); +} + +/*****************************************************************************/ + NMSettings * nm_settings_connection_get_settings(NMSettingsConnection *self) { diff --git a/src/core/settings/nm-settings-connection.h b/src/core/settings/nm-settings-connection.h index 835a978e..d15a75b7 100644 --- a/src/core/settings/nm-settings-connection.h +++ b/src/core/settings/nm-settings-connection.h @@ -379,4 +379,8 @@ void _nm_settings_connection_emit_signal_updated_internal( void _nm_settings_connection_cleanup_after_remove(NMSettingsConnection *self); +/*****************************************************************************/ + +char *nm_settings_connection_persist_mode_to_string(NMSettingsConnectionPersistMode mode); + #endif /* __NETWORKMANAGER_SETTINGS_CONNECTION_H__ */ diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c index 3bcbb71b..7c2b2026 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -297,7 +297,7 @@ check_if_bond_slave(shvarFile *ifcfg, NMSettingConnection *s_con) v = svGetValueStr(ifcfg, "MASTER", &value); if (v) { - master = nm_setting_connection_get_master(s_con); + master = nm_setting_connection_get_controller(s_con); if (master) { PARSE_WARNING("Already configured as slave of %s. Ignoring MASTER{_UUID}=\"%s\"", master, @@ -331,7 +331,7 @@ check_if_team_slave(shvarFile *ifcfg, NMSettingConnection *s_con) if (!v) return; - master = nm_setting_connection_get_master(s_con); + master = nm_setting_connection_get_controller(s_con); if (master) { PARSE_WARNING("Already configured as slave of %s. Ignoring TEAM_MASTER{_UUID}=\"%s\"", master, @@ -507,7 +507,7 @@ make_connection_setting(const char *file, if (v) { const char *old_value; - if ((old_value = nm_setting_connection_get_master(s_con))) { + if ((old_value = nm_setting_connection_get_controller(s_con))) { PARSE_WARNING("Already configured as slave of %s. Ignoring BRIDGE=\"%s\"", old_value, v); @@ -530,7 +530,7 @@ make_connection_setting(const char *file, if (v) { const char *old_value; - if ((old_value = nm_setting_connection_get_master(s_con))) { + if ((old_value = nm_setting_connection_get_controller(s_con))) { PARSE_WARNING("Already configured as slave of %s. Ignoring OVS_PORT=\"%s\"", old_value, v); @@ -550,7 +550,7 @@ make_connection_setting(const char *file, if (v) { const char *old_value; - if ((old_value = nm_setting_connection_get_master(s_con))) { + if ((old_value = nm_setting_connection_get_controller(s_con))) { PARSE_WARNING("Already configured as slave of %s. Ignoring VRF{_UUID}=\"%s\"", old_value, v); @@ -4129,6 +4129,10 @@ next: v = svGetValueStr(ifcfg, "IEEE_8021X_PHASE2_CA_PATH", &value); g_object_set(s_8021x, NM_SETTING_802_1X_PHASE2_CA_PATH, v, NULL); + nm_clear_g_free(&value); + v = svGetValueStr(ifcfg, "IEEE_8021X_OPENSSL_CIPHERS", &value); + g_object_set(s_8021x, NM_SETTING_802_1X_OPENSSL_CIPHERS, v, NULL); + g_object_set(s_8021x, NM_SETTING_802_1X_OPTIONAL, svGetValueBoolean(ifcfg, "IEEE_8021X_OPTIONAL", FALSE), diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c index b4edefbb..277d0d5f 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c @@ -828,6 +828,7 @@ const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[] = { _KEY_TYPE("IEEE_8021X_INNER_PRIVATE_KEY", NMS_IFCFG_KEY_TYPE_IS_PLAIN), _KEY_TYPE("IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD", NMS_IFCFG_KEY_TYPE_IS_PLAIN), _KEY_TYPE("IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD_FLAGS", NMS_IFCFG_KEY_TYPE_IS_PLAIN), + _KEY_TYPE("IEEE_8021X_OPENSSL_CIPHERS", NMS_IFCFG_KEY_TYPE_IS_PLAIN), _KEY_TYPE("IEEE_8021X_OPTIONAL", NMS_IFCFG_KEY_TYPE_IS_PLAIN), _KEY_TYPE("IEEE_8021X_PAC_FILE", NMS_IFCFG_KEY_TYPE_IS_PLAIN), _KEY_TYPE("IEEE_8021X_PASSWORD", NMS_IFCFG_KEY_TYPE_IS_PLAIN), diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h index eb9e418a..4e56a258 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h @@ -33,7 +33,7 @@ typedef struct { NMSIfcfgKeyTypeFlags key_flags; } NMSIfcfgKeyTypeInfo; -extern const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[264]; +extern const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[265]; const NMSIfcfgKeyTypeInfo *nms_ifcfg_well_known_key_find_info(const char *key, gssize *out_idx); diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c index 617c5ef6..f4598e2d 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c @@ -579,6 +579,10 @@ write_8021x_setting(NMConnection *connection, "IEEE_8021X_PIN_FLAGS", nm_setting_802_1x_get_pin_flags(s_8021x)); + svSetValueStr(ifcfg, + "IEEE_8021X_OPENSSL_CIPHERS", + nm_setting_802_1x_get_openssl_ciphers(s_8021x)); + if (!write_8021x_certs(s_8021x, secrets, blobs, FALSE, ifcfg, error)) return FALSE; @@ -1138,7 +1142,7 @@ write_wired_setting_impl(NMSettingWired *s_wired, shvarFile *ifcfg, gboolean is_ "GENERATE_MAC_ADDRESS_MASK", nm_setting_wired_get_generate_mac_address_mask(s_wired)); - macaddr_blacklist = nm_setting_wired_get_mac_address_blacklist(s_wired); + macaddr_blacklist = nm_setting_wired_get_mac_address_denylist(s_wired); if (macaddr_blacklist[0]) { gs_free char *blacklist_str = NULL; @@ -2247,7 +2251,7 @@ write_connection_setting(NMSettingConnection *s_con, shvarFile *ifcfg, const cha mud_url = nm_setting_connection_get_mud_url(s_con); svSetValue(ifcfg, "MUD_URL", mud_url); - master = nm_setting_connection_get_master(s_con); + master = nm_setting_connection_get_controller(s_con); if (master) { /* The reader prefers the *_UUID variants, however we still try to resolve * it into an interface name, so that legacy tooling is not confused. */ diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp new file mode 100644 index 00000000..abfcd6e4 --- /dev/null +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp @@ -0,0 +1,4 @@ +# Intel Corporation 82540EP Gigabit Ethernet Controller (Mobile) +DEVICE=eth0 +HWADDR=00:33:21:98:b9:f1 +BOOTPROTO=ibft diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static new file mode 100644 index 00000000..99b02e42 --- /dev/null +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static @@ -0,0 +1,4 @@ +# Intel Corporation 82540EP Gigabit Ethernet Controller (Mobile) +DEVICE=eth0 +HWADDR=00:33:21:98:b9:f0 +BOOTPROTO=ibft diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 index 27bcbbf9..f32f234a 100644 --- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 @@ -13,3 +13,4 @@ IEEE_8021X_PEAP_VERSION=1 IEEE_8021X_PEAP_FORCE_NEW_LABEL=yes IEEE_8021X_INNER_AUTH_METHODS=MSCHAPV2 IEEE_8021X_ANON_IDENTITY=somebody +IEEE_8021X_OPENSSL_CIPHERS=DEFAULT@SECLEVEL=0 diff --git a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index 1e6b6c25..40a18853 100644 --- a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -2230,7 +2230,7 @@ test_clear_master(void) s_con = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_CONNECTION); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "br0"); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, "br0"); g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, "bridge"); /* 2. write the connection to a new file */ @@ -2247,7 +2247,7 @@ test_clear_master(void) NULL, NULL); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, NULL); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, NULL); g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NULL); nmtst_assert_connection_verifies_after_normalization(connection, 0, 0); @@ -5317,6 +5317,8 @@ test_write_wired_dhcp_8021x_peap_mschapv2(void) "1", NM_SETTING_802_1X_PHASE2_AUTH, "mschapv2", + NM_SETTING_802_1X_OPENSSL_CIPHERS, + "DEFAULT@SECLEVEL=0", NULL); nm_setting_802_1x_add_eap_method(s_8021x, "peap"); @@ -7668,7 +7670,7 @@ test_read_bridge_component(void) NULL); s_con = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_CONNECTION); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "br0"); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, "br0"); g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); s_port = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_BRIDGE_PORT); @@ -8260,7 +8262,7 @@ test_read_bond_slave(void) s_con = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_CONNECTION); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "bond0"); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, "bond0"); g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); } @@ -8317,7 +8319,7 @@ test_read_bond_port(void) _connection_from_file(TEST_IFCFG_DIR "/ifcfg-test-bond-port", NULL, TYPE_ETHERNET, NULL); s_con = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_CONNECTION); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "bond99"); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, "bond99"); g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); s_port = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_BOND_PORT); @@ -8556,7 +8558,7 @@ test_read_bond_slave_ib(void) s_con = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_CONNECTION); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "bond0"); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, "bond0"); g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); } @@ -9096,7 +9098,7 @@ test_read_team_port(gconstpointer user_data) g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con), ==, NM_SETTING_WIRED_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "team0"); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, "team0"); s_team_port = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_TEAM_PORT); g_assert_cmpstr(nm_setting_team_port_get_config(s_team_port), ==, expected_config); @@ -9224,7 +9226,7 @@ test_read_team_port_empty_config(void) g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con), ==, NM_SETTING_WIRED_SETTING_NAME); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "team0"); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, "team0"); /* Normalization adds a team-port setting */ s_team_port = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_TEAM_PORT); diff --git a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c index b26bad69..e3e5f84f 100644 --- a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c +++ b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c @@ -91,7 +91,7 @@ assert_reread(NMConnection *connection, gboolean normalize_connection, const cha reread = keyfile_read_connection_from_file(testfile); if (!normalize_connection && (s_con = nm_connection_get_setting_connection(connection)) - && !nm_setting_connection_get_master(s_con) + && !nm_setting_connection_get_controller(s_con) && !nm_connection_get_setting_proxy(connection)) { connection_clone = nmtst_clone_connection(connection); connection = connection_clone; @@ -2003,7 +2003,7 @@ test_read_bridge_component(void) g_assert(s_con); g_assert_cmpstr(nm_setting_connection_get_id(s_con), ==, expected_id); g_assert_cmpstr(nm_setting_connection_get_uuid(s_con), ==, expected_uuid); - g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "br0"); + g_assert_cmpstr(nm_setting_connection_get_controller(s_con), ==, "br0"); g_assert_cmpstr(nm_setting_connection_get_port_type(s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); s_wired = nm_connection_get_setting_wired(connection); |