New upstream version 1.10.2 upstream/1.10.2

1 files changed, 70 insertions, 134 deletions

diff --git a/Makefile.in b/Makefile.in
index 7bfa978c..53b8e1a9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -672,6 +672,7 @@ am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	libnm-core/nm-setting-ovs-port.h libnm-core/nm-setting-ppp.h \
 	libnm-core/nm-setting-pppoe.h libnm-core/nm-setting-proxy.h \
 	libnm-core/nm-setting-serial.h \
+	libnm-core/nm-setting-tc-config.h \
 	libnm-core/nm-setting-team-port.h libnm-core/nm-setting-team.h \
 	libnm-core/nm-setting-tun.h libnm-core/nm-setting-user.h \
 	libnm-core/nm-setting-vlan.h libnm-core/nm-setting-vpn.h \
@@ -726,6 +727,7 @@ am__libnm_core_libnm_core_la_SOURCES_DIST =  \
 	libnm-core/nm-setting-ovs-port.c libnm-core/nm-setting-ppp.c \
 	libnm-core/nm-setting-pppoe.c libnm-core/nm-setting-proxy.c \
 	libnm-core/nm-setting-serial.c \
+	libnm-core/nm-setting-tc-config.c \
 	libnm-core/nm-setting-team-port.c libnm-core/nm-setting-team.c \
 	libnm-core/nm-setting-tun.c libnm-core/nm-setting-user.c \
 	libnm-core/nm-setting-vlan.c libnm-core/nm-setting-vpn.c \
@@ -786,6 +788,7 @@ am__objects_5 =  \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-pppoe.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-proxy.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-serial.lo \
+	libnm-core/libnm_core_libnm_core_la-nm-setting-tc-config.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-team-port.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-team.lo \
 	libnm-core/libnm_core_libnm_core_la-nm-setting-tun.lo \
@@ -1356,10 +1359,8 @@ am__src_libNetworkManager_la_SOURCES_DIST =  \
 	src/ppp/nm-ppp-manager.h src/ppp/nm-ppp-status.h \
 	src/nm-hostname-manager.c src/nm-hostname-manager.h \
 	src/settings/nm-agent-manager.c \
-	src/settings/nm-agent-manager.h \
-	src/settings/nm-inotify-helper.c \
-	src/settings/nm-inotify-helper.h \
-	src/settings/nm-secret-agent.c src/settings/nm-secret-agent.h \
+	src/settings/nm-agent-manager.h src/settings/nm-secret-agent.c \
+	src/settings/nm-secret-agent.h \
 	src/settings/nm-settings-connection.c \
 	src/settings/nm-settings-connection.h \
 	src/settings/nm-settings-plugin.c \
@@ -1444,7 +1445,6 @@ am_src_libNetworkManager_la_OBJECTS =  \
 	src/ppp/src_libNetworkManager_la-nm-ppp-manager-call.lo \
 	src/src_libNetworkManager_la-nm-hostname-manager.lo \
 	src/settings/src_libNetworkManager_la-nm-agent-manager.lo \
-	src/settings/src_libNetworkManager_la-nm-inotify-helper.lo \
 	src/settings/src_libNetworkManager_la-nm-secret-agent.lo \
 	src/settings/src_libNetworkManager_la-nm-settings-connection.lo \
 	src/settings/src_libNetworkManager_la-nm-settings-plugin.lo \
@@ -1682,6 +1682,8 @@ am__src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES_DIST =  \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h \
 	src/settings/plugins/ifcfg-rh/shvar.c \
 	src/settings/plugins/ifcfg-rh/shvar.h \
+	src/settings/plugins/ifcfg-rh/nm-inotify-helper.c \
+	src/settings/plugins/ifcfg-rh/nm-inotify-helper.h \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c \
@@ -1689,6 +1691,7 @@ am__src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES_DIST =  \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS = src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-shvar.lo \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.lo \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.lo \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo
@@ -1782,9 +1785,7 @@ am__EXEEXT_12 = libnm-core/tests/test-compare$(EXEEXT) \
 	libnm-core/tests/test-general$(EXEEXT) \
 	libnm-core/tests/test-keyfile$(EXEEXT) \
 	libnm-core/tests/test-secrets$(EXEEXT) \
-	libnm-core/tests/test-setting-8021x$(EXEEXT) \
-	libnm-core/tests/test-setting-bond$(EXEEXT) \
-	libnm-core/tests/test-setting-dcb$(EXEEXT) \
+	libnm-core/tests/test-setting$(EXEEXT) \
 	libnm-core/tests/test-settings-defaults$(EXEEXT) \
 	$(am__EXEEXT_3) src/dhcp/tests/test-dhcp-dhclient$(EXEEXT) \
 	src/dhcp/tests/test-dhcp-utils$(EXEEXT) \
@@ -2091,21 +2092,10 @@ libnm_core_tests_test_secrets_SOURCES =  \
 	libnm-core/tests/test-secrets.c
 libnm_core_tests_test_secrets_OBJECTS = libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.$(OBJEXT)
 libnm_core_tests_test_secrets_DEPENDENCIES = $(am__DEPENDENCIES_10)
-libnm_core_tests_test_setting_8021x_SOURCES =  \
-	libnm-core/tests/test-setting-8021x.c
-libnm_core_tests_test_setting_8021x_OBJECTS = libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.$(OBJEXT)
-libnm_core_tests_test_setting_8021x_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_10)
-libnm_core_tests_test_setting_bond_SOURCES =  \
-	libnm-core/tests/test-setting-bond.c
-libnm_core_tests_test_setting_bond_OBJECTS = libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.$(OBJEXT)
-libnm_core_tests_test_setting_bond_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_10)
-libnm_core_tests_test_setting_dcb_SOURCES =  \
-	libnm-core/tests/test-setting-dcb.c
-libnm_core_tests_test_setting_dcb_OBJECTS = libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.$(OBJEXT)
-libnm_core_tests_test_setting_dcb_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_10)
+libnm_core_tests_test_setting_SOURCES =  \
+	libnm-core/tests/test-setting.c
+libnm_core_tests_test_setting_OBJECTS = libnm-core/tests/libnm_core_tests_test_setting-test-setting.$(OBJEXT)
+libnm_core_tests_test_setting_DEPENDENCIES = $(am__DEPENDENCIES_10)
 libnm_core_tests_test_settings_defaults_SOURCES =  \
 	libnm-core/tests/test-settings-defaults.c
 libnm_core_tests_test_settings_defaults_OBJECTS = libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT)
@@ -2647,9 +2637,7 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \
 	$(nodist_libnm_core_tests_test_general_SOURCES) \
 	libnm-core/tests/test-keyfile.c \
 	libnm-core/tests/test-secrets.c \
-	libnm-core/tests/test-setting-8021x.c \
-	libnm-core/tests/test-setting-bond.c \
-	libnm-core/tests/test-setting-dcb.c \
+	libnm-core/tests/test-setting.c \
 	libnm-core/tests/test-settings-defaults.c \
 	libnm-glib/libnm-glib-test.c \
 	$(libnm_glib_tests_test_nm_client_SOURCES) \
@@ -2750,9 +2738,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(libnm_core_tests_test_general_SOURCES) \
 	libnm-core/tests/test-keyfile.c \
 	libnm-core/tests/test-secrets.c \
-	libnm-core/tests/test-setting-8021x.c \
-	libnm-core/tests/test-setting-bond.c \
-	libnm-core/tests/test-setting-dcb.c \
+	libnm-core/tests/test-setting.c \
 	libnm-core/tests/test-settings-defaults.c \
 	libnm-glib/libnm-glib-test.c \
 	$(am__libnm_glib_tests_test_nm_client_SOURCES_DIST) \
@@ -3562,6 +3548,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	src/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property \
 	src/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property \
 	src/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection \
+	src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config \
 	src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \
 	src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \
 	$(am__append_24) \
@@ -3585,6 +3572,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected \
@@ -3883,6 +3871,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \
 	examples/python/gi/get-active-connections.py \
 	examples/python/gi/get_ips.py \
 	examples/python/gi/list-connections.py \
+	examples/python/gi/nm-connection-update-stable-id.py \
 	examples/python/gi/setting-user-data.py \
 	examples/python/gi/show-wifi-networks.py \
 	examples/python/gi/update-ip4-method.py \
@@ -3941,9 +3930,7 @@ man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \
 check_programs = libnm-core/tests/test-compare \
 	libnm-core/tests/test-crypto libnm-core/tests/test-general \
 	libnm-core/tests/test-keyfile libnm-core/tests/test-secrets \
-	libnm-core/tests/test-setting-8021x \
-	libnm-core/tests/test-setting-bond \
-	libnm-core/tests/test-setting-dcb \
+	libnm-core/tests/test-setting \
 	libnm-core/tests/test-settings-defaults \
 	$(libnm_tests_programs) src/dhcp/tests/test-dhcp-dhclient \
 	src/dhcp/tests/test-dhcp-utils \
@@ -4282,6 +4269,7 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-pppoe.h \
 	libnm-core/nm-setting-proxy.h \
 	libnm-core/nm-setting-serial.h \
+	libnm-core/nm-setting-tc-config.h \
 	libnm-core/nm-setting-team-port.h \
 	libnm-core/nm-setting-team.h \
 	libnm-core/nm-setting-tun.h \
@@ -4355,6 +4343,7 @@ libnm_core_lib_c_real = shared/nm-utils/c-list-util.c \
 	libnm-core/nm-setting-ovs-port.c libnm-core/nm-setting-ppp.c \
 	libnm-core/nm-setting-pppoe.c libnm-core/nm-setting-proxy.c \
 	libnm-core/nm-setting-serial.c \
+	libnm-core/nm-setting-tc-config.c \
 	libnm-core/nm-setting-team-port.c libnm-core/nm-setting-team.c \
 	libnm-core/nm-setting-tun.c libnm-core/nm-setting-user.c \
 	libnm-core/nm-setting-vlan.c libnm-core/nm-setting-vpn.c \
@@ -4414,9 +4403,7 @@ libnm_core_tests_test_crypto_CPPFLAGS = $(libnm_core_tests_cppflags)
 libnm_core_tests_test_general_CPPFLAGS = $(libnm_core_tests_cppflags)
 libnm_core_tests_test_keyfile_CPPFLAGS = $(libnm_core_tests_cppflags)
 libnm_core_tests_test_secrets_CPPFLAGS = $(libnm_core_tests_cppflags)
-libnm_core_tests_test_setting_8021x_CPPFLAGS = $(libnm_core_tests_cppflags)
-libnm_core_tests_test_setting_bond_CPPFLAGS = $(libnm_core_tests_cppflags)
-libnm_core_tests_test_setting_dcb_CPPFLAGS = $(libnm_core_tests_cppflags)
+libnm_core_tests_test_setting_CPPFLAGS = $(libnm_core_tests_cppflags)
 libnm_core_tests_test_settings_defaults_CPPFLAGS = $(libnm_core_tests_cppflags)
 libnm_core_tests_test_general_SOURCES = \
 	libnm-core/tests/test-general-enums.h \
@@ -4435,9 +4422,7 @@ libnm_core_tests_test_crypto_LDADD = $(libnm_core_tests_ldadd)
 libnm_core_tests_test_general_LDADD = $(libnm_core_tests_ldadd)
 libnm_core_tests_test_keyfile_LDADD = $(libnm_core_tests_ldadd)
 libnm_core_tests_test_secrets_LDADD = $(libnm_core_tests_ldadd)
-libnm_core_tests_test_setting_8021x_LDADD = $(libnm_core_tests_ldadd)
-libnm_core_tests_test_setting_bond_LDADD = $(libnm_core_tests_ldadd)
-libnm_core_tests_test_setting_dcb_LDADD = $(libnm_core_tests_ldadd)
+libnm_core_tests_test_setting_LDADD = $(libnm_core_tests_ldadd)
 libnm_core_tests_test_settings_defaults_LDADD = $(libnm_core_tests_ldadd)
 
 ###############################################################################
@@ -4987,10 +4972,8 @@ src_libNetworkManager_la_SOURCES = src/nm-checkpoint-manager.c \
 	src/ppp/nm-ppp-manager.h src/ppp/nm-ppp-status.h \
 	src/nm-hostname-manager.c src/nm-hostname-manager.h \
 	src/settings/nm-agent-manager.c \
-	src/settings/nm-agent-manager.h \
-	src/settings/nm-inotify-helper.c \
-	src/settings/nm-inotify-helper.h \
-	src/settings/nm-secret-agent.c src/settings/nm-secret-agent.h \
+	src/settings/nm-agent-manager.h src/settings/nm-secret-agent.c \
+	src/settings/nm-secret-agent.h \
 	src/settings/nm-settings-connection.c \
 	src/settings/nm-settings-connection.h \
 	src/settings/nm-settings-plugin.c \
@@ -5278,6 +5261,8 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/shvar.c \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/shvar.h \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nm-inotify-helper.c \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nm-inotify-helper.h \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c \
@@ -7366,6 +7351,9 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-proxy.lo:  \
 libnm-core/libnm_core_libnm_core_la-nm-setting-serial.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
+libnm-core/libnm_core_libnm_core_la-nm-setting-tc-config.lo:  \
+	libnm-core/$(am__dirstamp) \
+	libnm-core/$(DEPDIR)/$(am__dirstamp)
 libnm-core/libnm_core_libnm_core_la-nm-setting-team-port.lo:  \
 	libnm-core/$(am__dirstamp) \
 	libnm-core/$(DEPDIR)/$(am__dirstamp)
@@ -8073,9 +8061,6 @@ src/settings/$(DEPDIR)/$(am__dirstamp):
 src/settings/src_libNetworkManager_la-nm-agent-manager.lo:  \
 	src/settings/$(am__dirstamp) \
 	src/settings/$(DEPDIR)/$(am__dirstamp)
-src/settings/src_libNetworkManager_la-nm-inotify-helper.lo:  \
-	src/settings/$(am__dirstamp) \
-	src/settings/$(DEPDIR)/$(am__dirstamp)
 src/settings/src_libNetworkManager_la-nm-secret-agent.lo:  \
 	src/settings/$(am__dirstamp) \
 	src/settings/$(DEPDIR)/$(am__dirstamp)
@@ -8521,6 +8506,9 @@ src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la: $(src_settings_plugins_ifcf
 src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-shvar.lo:  \
 	src/settings/plugins/ifcfg-rh/$(am__dirstamp) \
 	src/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
+src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.lo:  \
+	src/settings/plugins/ifcfg-rh/$(am__dirstamp) \
+	src/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
 src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo:  \
 	src/settings/plugins/ifcfg-rh/$(am__dirstamp) \
 	src/settings/plugins/ifcfg-rh/$(DEPDIR)/$(am__dirstamp)
@@ -9110,27 +9098,13 @@ libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.$(OBJEXT):  \
 libnm-core/tests/test-secrets$(EXEEXT): $(libnm_core_tests_test_secrets_OBJECTS) $(libnm_core_tests_test_secrets_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_secrets_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
 	@rm -f libnm-core/tests/test-secrets$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_secrets_OBJECTS) $(libnm_core_tests_test_secrets_LDADD) $(LIBS)
-libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.$(OBJEXT):  \
+libnm-core/tests/libnm_core_tests_test_setting-test-setting.$(OBJEXT):  \
 	libnm-core/tests/$(am__dirstamp) \
 	libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
 
-libnm-core/tests/test-setting-8021x$(EXEEXT): $(libnm_core_tests_test_setting_8021x_OBJECTS) $(libnm_core_tests_test_setting_8021x_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_setting_8021x_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
-	@rm -f libnm-core/tests/test-setting-8021x$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_setting_8021x_OBJECTS) $(libnm_core_tests_test_setting_8021x_LDADD) $(LIBS)
-libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.$(OBJEXT):  \
-	libnm-core/tests/$(am__dirstamp) \
-	libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
-
-libnm-core/tests/test-setting-bond$(EXEEXT): $(libnm_core_tests_test_setting_bond_OBJECTS) $(libnm_core_tests_test_setting_bond_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_setting_bond_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
-	@rm -f libnm-core/tests/test-setting-bond$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_setting_bond_OBJECTS) $(libnm_core_tests_test_setting_bond_LDADD) $(LIBS)
-libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.$(OBJEXT):  \
-	libnm-core/tests/$(am__dirstamp) \
-	libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
-
-libnm-core/tests/test-setting-dcb$(EXEEXT): $(libnm_core_tests_test_setting_dcb_OBJECTS) $(libnm_core_tests_test_setting_dcb_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_setting_dcb_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
-	@rm -f libnm-core/tests/test-setting-dcb$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_setting_dcb_OBJECTS) $(libnm_core_tests_test_setting_dcb_LDADD) $(LIBS)
+libnm-core/tests/test-setting$(EXEEXT): $(libnm_core_tests_test_setting_OBJECTS) $(libnm_core_tests_test_setting_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_setting_DEPENDENCIES) libnm-core/tests/$(am__dirstamp)
+	@rm -f libnm-core/tests/test-setting$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_setting_OBJECTS) $(libnm_core_tests_test_setting_LDADD) $(LIBS)
 libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT):  \
 	libnm-core/tests/$(am__dirstamp) \
 	libnm-core/tests/$(DEPDIR)/$(am__dirstamp)
@@ -9891,6 +9865,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-pppoe.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-proxy.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-serial.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-tc-config.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-team-port.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-team.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-tun.Plo@am__quote@
@@ -9913,9 +9888,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_general-test-general.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_keyfile-test-keyfile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_secrets-test-secrets.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_8021x-test-setting-8021x.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_bond-test-setting-bond.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_dcb-test-setting-dcb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting-test-setting.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_settings_defaults-test-settings-defaults.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_libdeprecated_nm_glib_la-libnm_glib.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnm-glib/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-access-point.Plo@am__quote@
@@ -10213,7 +10186,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/ppp/$(DEPDIR)/src_ppp_libnm_ppp_plugin_la-nm-ppp-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/ppp/$(DEPDIR)/src_ppp_nm_pppd_plugin_la-nm-pppd-plugin.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-agent-manager.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-inotify-helper.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-secret-agent.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-settings-connection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-settings-plugin.Plo@am__quote@
@@ -10225,6 +10197,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-connection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la-nms-ifcfg-rh-plugin.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-reader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Plo@am__quote@
@@ -11313,6 +11286,13 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-serial.lo: libnm-core/nm-setting-
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-serial.lo `test -f 'libnm-core/nm-setting-serial.c' || echo '$(srcdir)/'`libnm-core/nm-setting-serial.c
 
+libnm-core/libnm_core_libnm_core_la-nm-setting-tc-config.lo: libnm-core/nm-setting-tc-config.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-setting-tc-config.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-tc-config.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-tc-config.lo `test -f 'libnm-core/nm-setting-tc-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-tc-config.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-tc-config.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-tc-config.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/nm-setting-tc-config.c' object='libnm-core/libnm_core_libnm_core_la-nm-setting-tc-config.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-tc-config.lo `test -f 'libnm-core/nm-setting-tc-config.c' || echo '$(srcdir)/'`libnm-core/nm-setting-tc-config.c
+
 libnm-core/libnm_core_libnm_core_la-nm-setting-team-port.lo: libnm-core/nm-setting-team-port.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-setting-team-port.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-team-port.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-team-port.lo `test -f 'libnm-core/nm-setting-team-port.c' || echo '$(srcdir)/'`libnm-core/nm-setting-team-port.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-team-port.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-team-port.Plo
@@ -12762,13 +12742,6 @@ src/settings/src_libNetworkManager_la-nm-agent-manager.lo: src/settings/nm-agent
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/src_libNetworkManager_la-nm-agent-manager.lo `test -f 'src/settings/nm-agent-manager.c' || echo '$(srcdir)/'`src/settings/nm-agent-manager.c
 
-src/settings/src_libNetworkManager_la-nm-inotify-helper.lo: src/settings/nm-inotify-helper.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/src_libNetworkManager_la-nm-inotify-helper.lo -MD -MP -MF src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-inotify-helper.Tpo -c -o src/settings/src_libNetworkManager_la-nm-inotify-helper.lo `test -f 'src/settings/nm-inotify-helper.c' || echo '$(srcdir)/'`src/settings/nm-inotify-helper.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-inotify-helper.Tpo src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-inotify-helper.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/nm-inotify-helper.c' object='src/settings/src_libNetworkManager_la-nm-inotify-helper.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/src_libNetworkManager_la-nm-inotify-helper.lo `test -f 'src/settings/nm-inotify-helper.c' || echo '$(srcdir)/'`src/settings/nm-inotify-helper.c
-
 src/settings/src_libNetworkManager_la-nm-secret-agent.lo: src/settings/nm-secret-agent.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/src_libNetworkManager_la-nm-secret-agent.lo -MD -MP -MF src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-secret-agent.Tpo -c -o src/settings/src_libNetworkManager_la-nm-secret-agent.lo `test -f 'src/settings/nm-secret-agent.c' || echo '$(srcdir)/'`src/settings/nm-secret-agent.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-secret-agent.Tpo src/settings/$(DEPDIR)/src_libNetworkManager_la-nm-secret-agent.Plo
@@ -13609,6 +13582,13 @@ src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-shvar.lo `test -f 'src/settings/plugins/ifcfg-rh/shvar.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/shvar.c
 
+src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.lo: src/settings/plugins/ifcfg-rh/nm-inotify-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.lo -MD -MP -MF src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.Tpo -c -o src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.lo `test -f 'src/settings/plugins/ifcfg-rh/nm-inotify-helper.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nm-inotify-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.Tpo src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/settings/plugins/ifcfg-rh/nm-inotify-helper.c' object='src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nm-inotify-helper.lo `test -f 'src/settings/plugins/ifcfg-rh/nm-inotify-helper.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nm-inotify-helper.c
+
 src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo: src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo -MD -MP -MF src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Tpo -c -o src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.lo `test -f 'src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Tpo src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-utils.Plo
@@ -14666,47 +14646,19 @@ libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.obj: libnm-core/test
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_secrets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.obj `if test -f 'libnm-core/tests/test-secrets.c'; then $(CYGPATH_W) 'libnm-core/tests/test-secrets.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-secrets.c'; fi`
 
-libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.o: libnm-core/tests/test-setting-8021x.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_8021x_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_8021x-test-setting-8021x.Tpo -c -o libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.o `test -f 'libnm-core/tests/test-setting-8021x.c' || echo '$(srcdir)/'`libnm-core/tests/test-setting-8021x.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_8021x-test-setting-8021x.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_8021x-test-setting-8021x.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-setting-8021x.c' object='libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_8021x_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.o `test -f 'libnm-core/tests/test-setting-8021x.c' || echo '$(srcdir)/'`libnm-core/tests/test-setting-8021x.c
-
-libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.obj: libnm-core/tests/test-setting-8021x.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_8021x_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_8021x-test-setting-8021x.Tpo -c -o libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.obj `if test -f 'libnm-core/tests/test-setting-8021x.c'; then $(CYGPATH_W) 'libnm-core/tests/test-setting-8021x.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-setting-8021x.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_8021x-test-setting-8021x.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_8021x-test-setting-8021x.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-setting-8021x.c' object='libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_8021x_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_setting_8021x-test-setting-8021x.obj `if test -f 'libnm-core/tests/test-setting-8021x.c'; then $(CYGPATH_W) 'libnm-core/tests/test-setting-8021x.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-setting-8021x.c'; fi`
-
-libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.o: libnm-core/tests/test-setting-bond.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_bond_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_bond-test-setting-bond.Tpo -c -o libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.o `test -f 'libnm-core/tests/test-setting-bond.c' || echo '$(srcdir)/'`libnm-core/tests/test-setting-bond.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_bond-test-setting-bond.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_bond-test-setting-bond.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-setting-bond.c' object='libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_bond_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.o `test -f 'libnm-core/tests/test-setting-bond.c' || echo '$(srcdir)/'`libnm-core/tests/test-setting-bond.c
-
-libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.obj: libnm-core/tests/test-setting-bond.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_bond_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_bond-test-setting-bond.Tpo -c -o libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.obj `if test -f 'libnm-core/tests/test-setting-bond.c'; then $(CYGPATH_W) 'libnm-core/tests/test-setting-bond.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-setting-bond.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_bond-test-setting-bond.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_bond-test-setting-bond.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-setting-bond.c' object='libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_bond_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_setting_bond-test-setting-bond.obj `if test -f 'libnm-core/tests/test-setting-bond.c'; then $(CYGPATH_W) 'libnm-core/tests/test-setting-bond.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-setting-bond.c'; fi`
-
-libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.o: libnm-core/tests/test-setting-dcb.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_dcb-test-setting-dcb.Tpo -c -o libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.o `test -f 'libnm-core/tests/test-setting-dcb.c' || echo '$(srcdir)/'`libnm-core/tests/test-setting-dcb.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_dcb-test-setting-dcb.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_dcb-test-setting-dcb.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-setting-dcb.c' object='libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.o' libtool=no @AMDEPBACKSLASH@
+libnm-core/tests/libnm_core_tests_test_setting-test-setting.o: libnm-core/tests/test-setting.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_setting-test-setting.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting-test-setting.Tpo -c -o libnm-core/tests/libnm_core_tests_test_setting-test-setting.o `test -f 'libnm-core/tests/test-setting.c' || echo '$(srcdir)/'`libnm-core/tests/test-setting.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting-test-setting.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting-test-setting.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-setting.c' object='libnm-core/tests/libnm_core_tests_test_setting-test-setting.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.o `test -f 'libnm-core/tests/test-setting-dcb.c' || echo '$(srcdir)/'`libnm-core/tests/test-setting-dcb.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_setting-test-setting.o `test -f 'libnm-core/tests/test-setting.c' || echo '$(srcdir)/'`libnm-core/tests/test-setting.c
 
-libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.obj: libnm-core/tests/test-setting-dcb.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_dcb-test-setting-dcb.Tpo -c -o libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.obj `if test -f 'libnm-core/tests/test-setting-dcb.c'; then $(CYGPATH_W) 'libnm-core/tests/test-setting-dcb.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-setting-dcb.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_dcb-test-setting-dcb.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting_dcb-test-setting-dcb.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-setting-dcb.c' object='libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.obj' libtool=no @AMDEPBACKSLASH@
+libnm-core/tests/libnm_core_tests_test_setting-test-setting.obj: libnm-core/tests/test-setting.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_setting-test-setting.obj -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting-test-setting.Tpo -c -o libnm-core/tests/libnm_core_tests_test_setting-test-setting.obj `if test -f 'libnm-core/tests/test-setting.c'; then $(CYGPATH_W) 'libnm-core/tests/test-setting.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-setting.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting-test-setting.Tpo libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_setting-test-setting.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libnm-core/tests/test-setting.c' object='libnm-core/tests/libnm_core_tests_test_setting-test-setting.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_dcb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_setting_dcb-test-setting-dcb.obj `if test -f 'libnm-core/tests/test-setting-dcb.c'; then $(CYGPATH_W) 'libnm-core/tests/test-setting-dcb.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-setting-dcb.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_setting_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/tests/libnm_core_tests_test_setting-test-setting.obj `if test -f 'libnm-core/tests/test-setting.c'; then $(CYGPATH_W) 'libnm-core/tests/test-setting.c'; else $(CYGPATH_W) '$(srcdir)/libnm-core/tests/test-setting.c'; fi`
 
 libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.o: libnm-core/tests/test-settings-defaults.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_tests_test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.o -MD -MP -MF libnm-core/tests/$(DEPDIR)/libnm_core_tests_test_settings_defaults-test-settings-defaults.Tpo -c -o libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.o `test -f 'libnm-core/tests/test-settings-defaults.c' || echo '$(srcdir)/'`libnm-core/tests/test-settings-defaults.c
@@ -16642,23 +16594,9 @@ libnm-core/tests/test-secrets.log: libnm-core/tests/test-secrets$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-libnm-core/tests/test-setting-8021x.log: libnm-core/tests/test-setting-8021x$(EXEEXT)
-	@p='libnm-core/tests/test-setting-8021x$(EXEEXT)'; \
-	b='libnm-core/tests/test-setting-8021x'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-libnm-core/tests/test-setting-bond.log: libnm-core/tests/test-setting-bond$(EXEEXT)
-	@p='libnm-core/tests/test-setting-bond$(EXEEXT)'; \
-	b='libnm-core/tests/test-setting-bond'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-libnm-core/tests/test-setting-dcb.log: libnm-core/tests/test-setting-dcb$(EXEEXT)
-	@p='libnm-core/tests/test-setting-dcb$(EXEEXT)'; \
-	b='libnm-core/tests/test-setting-dcb'; \
+libnm-core/tests/test-setting.log: libnm-core/tests/test-setting$(EXEEXT)
+	@p='libnm-core/tests/test-setting$(EXEEXT)'; \
+	b='libnm-core/tests/test-setting'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
@@ -17650,9 +17588,7 @@ $(libnm_core_tests_test_crypto_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(libnm_core_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(libnm_core_tests_test_keyfile_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(libnm_core_tests_test_secrets_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(libnm_core_tests_test_setting_8021x_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(libnm_core_tests_test_setting_bond_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(libnm_core_tests_test_setting_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(libnm_core_tests_test_setting_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(libnm_core_tests_test_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 $(libnm_libnm_utils_la_OBJECTS) : $(libnm_lib_h_pub_mkenums)