diff --git a/Makefile.am b/Makefile.am
index fb18977464..6fdbe186f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -416,7 +416,7 @@ libnm_core_lib_h_pub_mkenums = \
 libnm_core_lib_h_priv = \
 	shared/nm-utils/nm-shared-utils.h \
 	shared/nm-utils/nm-udev-utils.h \
-	shared/nm-setting-metadata.h \
+	shared/nm-meta-setting.h \
 	libnm-core/crypto.h \
 	libnm-core/nm-connection-private.h \
 	libnm-core/nm-core-internal.h \
@@ -429,7 +429,7 @@ libnm_core_lib_h_priv = \
 libnm_core_lib_c_real = \
 	shared/nm-utils/nm-shared-utils.c \
 	shared/nm-utils/nm-udev-utils.c \
-	shared/nm-setting-metadata.c \
+	shared/nm-meta-setting.c \
 	libnm-core/crypto.c \
 	libnm-core/nm-connection.c \
 	libnm-core/nm-dbus-utils.c \
@@ -3118,8 +3118,11 @@ bin_PROGRAMS += clients/cli/nmcli
 
 clients_cli_nmcli_SOURCES = \
 	\
-	shared/nm-setting-metadata.c \
-	shared/nm-setting-metadata.h \
+	shared/nm-meta-setting.c \
+	shared/nm-meta-setting.h \
+	\
+	clients/common/nm-meta-setting-desc.c \
+	clients/common/nm-meta-setting-desc.h \
 	\
 	clients/cli/agent.c \
 	clients/cli/agent.h \
diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index 962ee54de2..28f7ebfcd9 100644
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -31,301 +31,6 @@
 
 /*****************************************************************************/
 
-static gboolean validate_int (NMSetting *setting, const char* prop, gint val, GError **error);
-static gboolean validate_uint (NMSetting *setting, const char* prop, guint val, GError **error);
-static gboolean validate_int64 (NMSetting *setting, const char* prop, gint64 val, GError **error);
-static char *secret_flags_to_string (guint32 flags, NMMetaAccessorGetType get_type);
-
-#define ALL_SECRET_FLAGS \
-	(NM_SETTING_SECRET_FLAG_NONE | \
-	 NM_SETTING_SECRET_FLAG_AGENT_OWNED | \
-	 NM_SETTING_SECRET_FLAG_NOT_SAVED | \
-	 NM_SETTING_SECRET_FLAG_NOT_REQUIRED)
-
-#define HIDDEN_TEXT "<hidden>"
-
-/*****************************************************************************/
-
-#define ARGS_DESCRIBE_FCN \
-	const NMMetaSettingInfoEditor *setting_info, const NMMetaPropertyInfo *property_info, char **out_to_free
-
-#define ARGS_GET_FCN \
-	const NMMetaSettingInfoEditor *setting_info, const NMMetaPropertyInfo *property_info, NMSetting *setting, NMMetaAccessorGetType get_type, gboolean show_secrets
-
-#define ARGS_SET_FCN \
-	const NMMetaSettingInfoEditor *setting_info, const NMMetaPropertyInfo *property_info, NMSetting *setting, const char *value, GError **error
-
-#define ARGS_REMOVE_FCN \
-	const NMMetaSettingInfoEditor *setting_info, const NMMetaPropertyInfo *property_info, NMSetting *setting, const char *value, guint32 idx, GError **error
-
-#define ARGS_VALUES_FCN \
-	const NMMetaSettingInfoEditor *setting_info, const NMMetaPropertyInfo *property_info, char ***out_to_free
-
-static char *
-_get_fcn_name (ARGS_GET_FCN)
-{
-	nm_assert (nm_streq0 (nm_setting_get_name (setting), setting_info->general->setting_name));
-	return g_strdup (setting_info->general->setting_name);
-}
-
-static char *
-_get_fcn_nmc_with_default (ARGS_GET_FCN)
-{
-	const char *s;
-	char *s_full;
-	GValue val = G_VALUE_INIT;
-
-	if (property_info->property_typ_data->subtype.get_with_default.fcn (setting)) {
-		if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
-			return g_strdup ("");
-		return g_strdup (_("(default)"));
-	}
-
-	g_value_init (&val, G_TYPE_STRING);
-	g_object_get_property (G_OBJECT (setting), property_info->property_name, &val);
-	s = g_value_get_string (&val);
-	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
-		s_full = g_strdup (s && *s ? s : " ");
-	else
-		s_full = s ? g_strdup_printf ("\"%s\"", s) : g_strdup ("");
-	g_value_unset (&val);
-	return s_full;
-}
-
-static char *
-_get_fcn_gobject (ARGS_GET_FCN)
-{
-	char *s;
-	GValue val = G_VALUE_INIT;
-
-	g_value_init (&val, G_TYPE_STRING);
-	g_object_get_property (G_OBJECT (setting), property_info->property_name, &val);
-	s = g_value_dup_string (&val);
-	g_value_unset (&val);
-	return s;
-}
-
-static char *
-_get_fcn_gobject_mtu (ARGS_GET_FCN)
-{
-	guint32 mtu;
-
-	if (   !property_info->property_typ_data
-	    || !property_info->property_typ_data->subtype.mtu.get_fcn)
-		return _get_fcn_gobject (setting_info, property_info, setting, get_type, show_secrets);
-
-	mtu = property_info->property_typ_data->subtype.mtu.get_fcn (setting);
-	if (mtu == 0) {
-		if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
-			return g_strdup ("auto");
-		else
-			return g_strdup (_("auto"));
-	}
-	return g_strdup_printf ("%u", (unsigned) mtu);
-}
-
-static char *
-_get_fcn_gobject_secret_flags (ARGS_GET_FCN)
-{
-	guint v;
-	GValue val = G_VALUE_INIT;
-
-	g_value_init (&val, G_TYPE_UINT);
-	g_object_get_property (G_OBJECT (setting), property_info->property_name, &val);
-	v = g_value_get_uint (&val);
-	g_value_unset (&val);
-	return secret_flags_to_string (v, get_type);
-}
-
-/*****************************************************************************/
-
-static gboolean
-_set_fcn_gobject_string (ARGS_SET_FCN)
-{
-	if (   property_info->property_typ_data
-	    && property_info->property_typ_data->values_static) {
-		value = nmc_string_is_valid (value,
-		                             (const char **) property_info->property_typ_data->values_static,
-		                             error);
-		if (!value)
-			return FALSE;
-	}
-	g_object_set (setting, property_info->property_name, value, NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_gobject_bool (ARGS_SET_FCN)
-{
-	gboolean val_bool;
-
-	if (!nmc_string_to_bool (value, &val_bool, error))
-		return FALSE;
-
-	g_object_set (setting, property_info->property_name, val_bool, NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_gobject_trilean (ARGS_SET_FCN)
-{
-	long int val_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_int (value, TRUE, -1, 1, &val_int)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid value; use -1, 0 or 1"), value);
-		return FALSE;
-	}
-
-	g_object_set (setting, property_info->property_name, val_int, NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_gobject_int (ARGS_SET_FCN)
-{
-	long int val_int;
-
-	if (!nmc_string_to_int (value, TRUE, G_MININT, G_MAXINT, &val_int)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid number (or out of range)"), value);
-		return FALSE;
-	}
-
-	/* Validate the number according to the property spec */
-	if (!validate_int (setting, property_info->property_name, (gint) val_int, error))
-		return FALSE;
-
-	g_object_set (setting, property_info->property_name, (gint) val_int, NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_gobject_int64 (ARGS_SET_FCN)
-{
-	long val_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_int (value, FALSE, 0, 0, &val_int)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid number (or out of range)"), value);
-		return FALSE;
-	}
-
-	/* Validate the number according to the property spec */
-	if (!validate_int64 (setting, property_info->property_name, (gint64) val_int, error))
-		return FALSE;
-
-	g_object_set (setting, property_info->property_name, (gint64) val_int, NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_gobject_uint (ARGS_SET_FCN)
-{
-	unsigned long val_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_uint (value, TRUE, 0, G_MAXUINT, &val_int)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid number (or out of range)"), value);
-		return FALSE;
-	}
-
-	/* Validate the number according to the property spec */
-	if (!validate_uint (setting, property_info->property_name, (guint) val_int, error))
-		return FALSE;
-
-	g_object_set (setting, property_info->property_name, (guint) val_int, NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_gobject_mtu (ARGS_SET_FCN)
-{
-	if (nm_streq0 (value, "auto"))
-		value = "0";
-	return _set_fcn_gobject_uint (setting_info, property_info, setting, value, error);
-}
-
-static gboolean
-_set_fcn_gobject_mac (ARGS_SET_FCN)
-{
-	NMMetaPropertyTypeMacMode mode;
-	gboolean valid;
-
-	if (property_info->property_typ_data)
-		mode = property_info->property_typ_data->subtype.mac.mode;
-	else
-		mode = NM_META_PROPERTY_TYPE_MAC_MODE_DEFAULT;
-
-
-	if (mode == NM_META_PROPERTY_TYPE_MAC_MODE_INFINIBAND)
-		valid = nm_utils_hwaddr_valid (value, INFINIBAND_ALEN);
-	else {
-		valid =    nm_utils_hwaddr_valid (value, ETH_ALEN)
-		        || (   mode == NM_META_PROPERTY_TYPE_MAC_MODE_CLONED
-		            && NM_CLONED_MAC_IS_SPECIAL (value));
-	}
-
-	if (!valid) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid Ethernet MAC"), value);
-		return FALSE;
-	}
-
-	g_object_set (setting, property_info->property_name, value, NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_gobject_secret_flags (ARGS_SET_FCN)
-{
-	char **strv = NULL, **iter;
-	unsigned long flags = 0, val_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (value, " \t,", 0);
-	for (iter = strv; iter && *iter; iter++) {
-		if (!nmc_string_to_uint (*iter, TRUE, 0, ALL_SECRET_FLAGS, &val_int)) {
-			g_set_error (error, 1, 0, _("'%s' is not a valid flag number; use <0-%d>"),
-			             *iter, ALL_SECRET_FLAGS);
-			g_strfreev (strv);
-			return FALSE;
-		}
-		flags += val_int;
-	}
-	g_strfreev (strv);
-
-	/* Validate the flags number */
-	if (flags > ALL_SECRET_FLAGS) {
-		flags = ALL_SECRET_FLAGS;
-		g_print (_("Warning: '%s' sum is higher than all flags => all flags set\n"), value);
-	}
-
-	g_object_set (setting, property_info->property_name, (guint) flags, NULL);
-	return TRUE;
-}
-
-/*****************************************************************************/
-
-static const char *const*
-_values_fcn_gobject_enum (ARGS_VALUES_FCN)
-{
-	char **v, **w;
-	bool has_minmax =    property_info->property_typ_data->subtype.gobject_enum.min
-	                  || property_info->property_typ_data->subtype.gobject_enum.max;
-
-	v = (char **) nm_utils_enum_get_values (             property_info->property_typ_data->subtype.gobject_enum.get_gtype (),
-	                                        has_minmax ? property_info->property_typ_data->subtype.gobject_enum.min : G_MININT,
-	                                        has_minmax ? property_info->property_typ_data->subtype.gobject_enum.max : G_MAXINT);
-	for (w = v; w && *w; w++)
-		*w = g_strdup (*w);
-	return (const char *const*) (*out_to_free = v);
-}
-
-/*****************************************************************************/
-
 static const NMMetaSettingInfoEditor *
 _meta_find_setting_info_by_name (const char *setting_name)
 {
@@ -468,3619 +173,6 @@ _get_nmc_output_fields (const NMMetaSettingInfoEditor *setting_info)
 
 /*****************************************************************************/
 
-static char *
-wep_key_type_to_string (NMWepKeyType type)
-{
-	switch (type) {
-	case NM_WEP_KEY_TYPE_KEY:
-		return g_strdup_printf (_("%d (key)"), type);
-	case NM_WEP_KEY_TYPE_PASSPHRASE:
-		return g_strdup_printf (_("%d (passphrase)"), type);
-	case NM_WEP_KEY_TYPE_UNKNOWN:
-	default:
-		return g_strdup_printf (_("%d (unknown)"), type);
-	}
-}
-
-static char *
-bytes_to_string (GBytes *bytes)
-{
-	const guint8 *data;
-	gsize len;
-	GString *cert = NULL;
-	int i;
-
-	if (!bytes)
-		return NULL;
-	data = g_bytes_get_data (bytes, &len);
-
-	cert = g_string_new (NULL);
-	for (i = 0; i < len; i++)
-		g_string_append_printf (cert, "%02X", data[i]);
-
-	return g_string_free (cert, FALSE);
-}
-
-static char *
-vlan_flags_to_string (guint32 flags, NMMetaAccessorGetType get_type)
-{
-	GString *flag_str;
-
-	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
-		return g_strdup_printf ("%u", flags);
-
-	if (flags == 0)
-		return g_strdup (_("0 (NONE)"));
-
-	flag_str = g_string_new (NULL);
-	g_string_printf (flag_str, "%d (", flags);
-
-	if (flags & NM_VLAN_FLAG_REORDER_HEADERS)
-		g_string_append (flag_str, _("REORDER_HEADERS, "));
-	if (flags & NM_VLAN_FLAG_GVRP)
-		g_string_append (flag_str, _("GVRP, "));
-	if (flags & NM_VLAN_FLAG_LOOSE_BINDING)
-		g_string_append (flag_str, _("LOOSE_BINDING, "));
-	if (flags & NM_VLAN_FLAG_MVRP)
-		g_string_append (flag_str, _("MVRP, "));
-
-	if (flag_str->str[flag_str->len-1] == '(')
-		g_string_append (flag_str, _("unknown"));
-	else
-		g_string_truncate (flag_str, flag_str->len-2);  /* chop off trailing ', ' */
-
-	g_string_append_c (flag_str, ')');
-
-	return g_string_free (flag_str, FALSE);
-}
-
-static char *
-vlan_priorities_to_string (NMSettingVlan *s_vlan, NMVlanPriorityMap map)
-{
-	GString *priorities;
-	int i;
-
-	priorities = g_string_new (NULL);
-	for (i = 0; i < nm_setting_vlan_get_num_priorities (s_vlan, map); i++) {
-		guint32 from, to;
-
-		if (nm_setting_vlan_get_priority (s_vlan, map, i, &from, &to))
-			g_string_append_printf (priorities, "%d:%d,", from, to);
-	}
-	if (priorities->len)
-		g_string_truncate (priorities, priorities->len-1);  /* chop off trailing ',' */
-
-	return g_string_free (priorities, FALSE);
-}
-
-static char *
-ip6_privacy_to_string (NMSettingIP6ConfigPrivacy ip6_privacy, NMMetaAccessorGetType get_type)
-{
-	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
-		return g_strdup_printf ("%d", ip6_privacy);
-
-	switch (ip6_privacy) {
-	case NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED:
-		return g_strdup_printf (_("%d (disabled)"), ip6_privacy);
-	case NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR:
-		return g_strdup_printf (_("%d (enabled, prefer public IP)"), ip6_privacy);
-	case NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR:
-		return g_strdup_printf (_("%d (enabled, prefer temporary IP)"), ip6_privacy);
-	default:
-		return g_strdup_printf (_("%d (unknown)"), ip6_privacy);
-	}
-}
-
-static char *
-autoconnect_slaves_to_string (NMSettingConnectionAutoconnectSlaves autoconnect_slaves,
-                              NMMetaAccessorGetType get_type)
-{
-	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
-		return g_strdup_printf ("%d", autoconnect_slaves);
-
-	switch (autoconnect_slaves) {
-	case NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO:
-		return g_strdup_printf (_("%d (no)"), autoconnect_slaves);
-	case NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES:
-		return g_strdup_printf (_("%d (yes)"), autoconnect_slaves);
-	case NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT:
-	default:
-		return g_strdup_printf (_("%d (default)"), autoconnect_slaves);
-	}
-}
-
-static char *
-secret_flags_to_string (guint32 flags, NMMetaAccessorGetType get_type)
-{
-	GString *flag_str;
-
-	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
-		return g_strdup_printf ("%u", flags);
-
-	if (flags == 0)
-		return g_strdup (_("0 (none)"));
-
-	flag_str = g_string_new (NULL);
-	g_string_printf (flag_str, "%u (", flags);
-
-	if (flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED)
-		g_string_append (flag_str, _("agent-owned, "));
-	if (flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)
-		g_string_append (flag_str, _("not saved, "));
-	if (flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED)
-		g_string_append (flag_str, _("not required, "));
-
-	if (flag_str->str[flag_str->len-1] == '(')
-		g_string_append (flag_str, _("unknown"));
-	else
-		g_string_truncate (flag_str, flag_str->len-2);  /* chop off trailing ', ' */
-
-	g_string_append_c (flag_str, ')');
-
-	return g_string_free (flag_str, FALSE);
-}
-
-static void
-vpn_data_item (const char *key, const char *value, gpointer user_data)
-{
-	GString *ret_str = (GString *) user_data;
-
-	if (ret_str->len != 0)
-		g_string_append (ret_str, ", ");
-
-	g_string_append_printf (ret_str, "%s = %s", key, value);
-}
-
-#define DEFINE_SETTER_STR_LIST_MULTI(def_func, s_macro, set_func) \
-	static gboolean \
-	def_func (NMSetting *setting, \
-	          const char *prop, \
-	          const char *value, \
-	          const char **valid_strv, \
-	          GError **error) \
-	{ \
-		char **strv = NULL, **iter; \
-		const char *item; \
-		g_return_val_if_fail (error == NULL || *error == NULL, FALSE); \
-		strv = nmc_strsplit_set (value, " \t,", 0); \
-		for (iter = strv; iter && *iter; iter++) { \
-			if (!(item = nmc_string_is_valid (g_strstrip (*iter), valid_strv, error))) { \
-				g_strfreev (strv); \
-				return FALSE; \
-			} \
-			set_func (s_macro (setting), item); \
-		} \
-		g_strfreev (strv); \
-		return TRUE; \
-	}
-
-#define DEFINE_SETTER_OPTIONS(def_func, s_macro, s_type, add_func, valid_func1, valid_func2) \
-	static gboolean \
-	def_func (ARGS_SET_FCN) \
-	{ \
-		char **strv = NULL, **iter; \
-		const char **(*valid_func1_p) (s_type *) = valid_func1; \
-		const char * (*valid_func2_p) (const char *, const char *, GError **) = valid_func2; \
-		const char *opt_name, *opt_val; \
-		\
-		g_return_val_if_fail (error == NULL || *error == NULL, FALSE); \
-		\
-		strv = nmc_strsplit_set (value, ",", 0); \
-		for (iter = strv; iter && *iter; iter++) { \
-			char *left = g_strstrip (*iter); \
-			char *right = strchr (left, '='); \
-			if (!right) { \
-				g_set_error (error, 1, 0, _("'%s' is not valid; use <option>=<value>"), *iter); \
-				g_strfreev (strv); \
-				return FALSE; \
-			} \
-			*right++ = '\0'; \
-			\
-			if (valid_func1_p) { \
-				const char **valid_options = valid_func1_p (s_macro (setting)); \
-				if (!(opt_name = nmc_string_is_valid (g_strstrip (left), valid_options, error))) { \
-					g_strfreev (strv); \
-					return FALSE; \
-				} \
-			} else \
-				opt_name = g_strstrip (left);\
-			\
-			opt_val = g_strstrip (right); \
-			if (valid_func2_p) { \
-				if (!(opt_val = valid_func2_p ((const char *) left, (const char *) opt_val, error))) { \
-					g_strfreev (strv); \
-					return FALSE; \
-				}\
-			}\
-			add_func (s_macro (setting), opt_name, opt_val); \
-		} \
-		g_strfreev (strv); \
-		return TRUE; \
-	}
-
-#define DEFINE_REMOVER_INDEX_OR_VALUE(def_func, s_macro, num_func, rem_func_idx, rem_func_val) \
-	static gboolean \
-	def_func (ARGS_REMOVE_FCN) \
-	{ \
-		guint32 num; \
-		if (value) { \
-			gboolean ret; \
-			char *value_stripped = g_strstrip (g_strdup (value)); \
-			ret = rem_func_val (s_macro (setting), value_stripped, error); \
-			g_free (value_stripped); \
-			return ret; \
-		} \
-		num = num_func (s_macro (setting)); \
-		if (num == 0) { \
-			g_set_error_literal (error, 1, 0, _("no item to remove")); \
-			return FALSE; \
-		} \
-		if (idx >= num) { \
-			g_set_error (error, 1, 0, _("index '%d' is not in range <0-%d>"), idx, num - 1); \
-			return FALSE; \
-		} \
-		rem_func_idx (s_macro (setting), idx); \
-		return TRUE; \
-	}
-
-#define DEFINE_REMOVER_OPTION(def_func, s_macro, rem_func) \
-	static gboolean \
-	def_func (ARGS_REMOVE_FCN) \
-	{ \
-		gboolean success = FALSE; \
-		if (value && *value) { \
-			success = rem_func (s_macro (setting), value); \
-			if (!success) \
-				g_set_error (error, 1, 0, _("invalid option '%s'"), value); \
-		} else \
-			g_set_error_literal (error, 1, 0, _("missing option")); \
-		return success; \
-	}
-
-#define DEFINE_ALLOWED_VAL_FUNC(def_func, valid_values) \
-	static const char *const* \
-	def_func (NMSetting *setting, const char *prop) \
-	{ \
-		return valid_values; \
-	}
-
-#define DEFINE_SETTER_MAC_BLACKLIST(def_func, s_macro, add_func) \
-	static gboolean \
-	def_func (ARGS_SET_FCN) \
-	{ \
-		guint8 buf[32]; \
-		char **list = NULL, **iter; \
-		GSList *macaddr_blacklist = NULL; \
-		\
-		g_return_val_if_fail (error == NULL || *error == NULL, FALSE); \
-		\
-		list = nmc_strsplit_set (value, " \t,", 0); \
-		for (iter = list; iter && *iter; iter++) { \
-			if (!nm_utils_hwaddr_aton (*iter, buf, ETH_ALEN)) { \
-				g_set_error (error, 1, 0, _("'%s' is not a valid MAC"), *iter); \
-				g_strfreev (list); \
-				g_slist_free (macaddr_blacklist); \
-				return FALSE; \
-			} \
-		} \
-		\
-		for (iter = list; iter && *iter; iter++) \
-			add_func (s_macro (setting), *iter); \
-		\
-		g_strfreev (list); \
-		return TRUE; \
-	}
-
-
-static gboolean
-verify_string_list (char **strv,
-                    const char *prop,
-                    gboolean (*validate_func) (const char *),
-                    GError **error)
-{
-	char **iter;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	for (iter = strv; iter && *iter; iter++) {
-		if (**iter == '\0')
-			continue;
-		if (validate_func) {
-			if (!validate_func (*iter)) {
-				g_set_error (error, 1, 0, _("'%s' is not valid"),
-				             *iter);
-				return FALSE;
-			}
-		}
-	}
-	return TRUE;
-}
-
-static gboolean
-validate_int (NMSetting *setting, const char* prop, gint val, GError **error)
-{
-	GParamSpec *pspec;
-	GValue value = G_VALUE_INIT;
-	gboolean success = TRUE;
-
-	g_value_init (&value, G_TYPE_INT);
-	g_value_set_int (&value, val);
-	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop);
-	g_assert (G_IS_PARAM_SPEC (pspec));
-	if (g_param_value_validate (pspec, &value)) {
-		GParamSpecInt *pspec_int = (GParamSpecInt *) pspec;
-		g_set_error (error, 1, 0, _("'%d' is not valid; use <%d-%d>"),
-		             val, pspec_int->minimum, pspec_int->maximum);
-		success = FALSE;
-	}
-	g_value_unset (&value);
-	return success;
-}
-
-static gboolean
-validate_int64 (NMSetting *setting, const char* prop, gint64 val, GError **error)
-{
-	GParamSpec *pspec;
-	GValue value = G_VALUE_INIT;
-	gboolean success = TRUE;
-
-	g_value_init (&value, G_TYPE_INT64);
-	g_value_set_int64 (&value, val);
-	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop);
-	g_assert (G_IS_PARAM_SPEC (pspec));
-	if (g_param_value_validate (pspec, &value)) {
-		GParamSpecInt64 *pspec_int = (GParamSpecInt64 *) pspec;
-		G_STATIC_ASSERT (sizeof (long long) >= sizeof (gint64));
-		g_set_error (error, 1, 0, _("'%lld' is not valid; use <%lld-%lld>"),
-		             (long long) val, (long long) pspec_int->minimum, (long long) pspec_int->maximum);
-		success = FALSE;
-	}
-	g_value_unset (&value);
-	return success;
-}
-
-static gboolean
-validate_uint (NMSetting *setting, const char* prop, guint val, GError **error)
-{
-	GParamSpec *pspec;
-	GValue value = G_VALUE_INIT;
-	gboolean success = TRUE;
-
-	g_value_init (&value, G_TYPE_UINT);
-	g_value_set_uint (&value, val);
-	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop);
-	g_assert (G_IS_PARAM_SPEC (pspec));
-	if (g_param_value_validate (pspec, &value)) {
-		GParamSpecUInt *pspec_uint = (GParamSpecUInt *) pspec;
-		g_set_error (error, 1, 0, _("'%u' is not valid; use <%u-%u>"),
-		             val, pspec_uint->minimum, pspec_uint->maximum);
-		success = FALSE;
-	}
-	g_value_unset (&value);
-	return success;
-}
-
-static char *
-flag_values_to_string (GFlagsValue *array, guint n)
-{
-	GString *str;
-	guint i;
-
-	str = g_string_new (NULL);
-	for (i = 0; i < n; i++)
-		g_string_append_printf (str, "%u, ", array[i].value);
-	if (str->len)
-		g_string_truncate (str, str->len-2);  /* chop off trailing ', ' */
-	return g_string_free (str, FALSE);
-}
-
-static gboolean
-validate_flags (NMSetting *setting, const char* prop, guint val, GError **error)
-{
-	GParamSpec *pspec;
-	GValue value = G_VALUE_INIT;
-	gboolean success = TRUE;
-
-	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop);
-	g_assert (G_IS_PARAM_SPEC (pspec));
-
-	g_value_init (&value, pspec->value_type);
-	g_value_set_flags (&value, val);
-
-	if (g_param_value_validate (pspec, &value)) {
-		GParamSpecFlags *pspec_flags = (GParamSpecFlags *) pspec;
-		char *flag_values = flag_values_to_string (pspec_flags->flags_class->values,
-		                                           pspec_flags->flags_class->n_values);
-		g_set_error (error, 1, 0, _("'%u' flags are not valid; use combination of %s"),
-		             val, flag_values);
-		g_free (flag_values);
-		success = FALSE;
-	}
-	g_value_unset (&value);
-	return success;
-}
-
-static gboolean
-check_and_set_string (NMSetting *setting,
-                      const char *prop,
-                      const char *val,
-                      const char **valid_strv,
-                      GError **error)
-{
-	const char *checked_val;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	checked_val = nmc_string_is_valid (val, valid_strv, error);
-	if (!checked_val)
-		return FALSE;
-
-	g_object_set (setting, prop, checked_val, NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_gobject_flags (ARGS_SET_FCN)
-{
-	unsigned long val_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_uint (value, TRUE, 0, G_MAXUINT, &val_int)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid number (or out of range)"), value);
-		return FALSE;
-	}
-
-	/* Validate the flags according to the property spec */
-	if (!validate_flags (setting, property_info->property_name, (guint) val_int, error))
-		return FALSE;
-
-	g_object_set (setting, property_info->property_name, (guint) val_int, NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_gobject_ssid (ARGS_SET_FCN)
-{
-	GBytes *ssid;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (strlen (value) > 32) {
-		g_set_error (error, 1, 0, _("'%s' is not valid"), value);
-		return FALSE;
-	}
-
-	ssid = g_bytes_new (value, strlen (value));
-	g_object_set (setting, property_info->property_name, ssid, NULL);
-	g_bytes_unref (ssid);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_gobject_ifname (ARGS_SET_FCN)
-{
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nm_utils_is_valid_iface_name (value, error))
-		return FALSE;
-	g_object_set (setting, property_info->property_name, value, NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_vpn_service_type (ARGS_SET_FCN)
-{
-	gs_free char *service_name = NULL;
-
-	service_name = nm_vpn_plugin_info_list_find_service_type (nm_vpn_get_plugin_infos (), value);
-	g_object_set (setting, property_info->property_name, service_name ? : value, NULL);
-	return TRUE;
-}
-
-static gboolean
-nmc_util_is_domain (const char *domain)
-{
-	//FIXME: implement
-	return TRUE;
-}
-
-static gboolean
-nmc_property_set_byte_array (NMSetting *setting, const char *prop, const char *value, GError **error)
-{
-	char **strv = NULL, **iter;
-	char *val_strip;
-	const char *delimiters = " \t,";
-	long int val_int;
-	GBytes *bytes;
-	GByteArray *array = NULL;
-	gboolean success = TRUE;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	val_strip = g_strstrip (g_strdup (value));
-
-	/* First try hex string in the format of AAbbCCDd */
-	bytes = nm_utils_hexstr2bin (val_strip);
-	if (bytes) {
-		array = g_bytes_unref_to_array (bytes);
-		goto done;
-	}
-
-	/* Otherwise, consider the following format: AA b 0xCc D */
-	strv = nmc_strsplit_set (val_strip, delimiters, 0);
-	array = g_byte_array_sized_new (g_strv_length (strv));
-	for (iter = strv; iter && *iter; iter++) {
-		if (!nmc_string_to_int_base (g_strstrip (*iter), 16, TRUE, 0, 255, &val_int)) {
-			g_set_error (error, 1, 0, _("'%s' is not a valid hex character"), *iter);
-			success = FALSE;
-			goto done;
-		}
-		g_byte_array_append (array, (const guint8 *) &val_int, 1);
-	}
-
-done:
-	if (success)
-		g_object_set (setting, prop, array, NULL);
-
-	g_strfreev (strv);
-	if (array)
-		g_byte_array_free (array, TRUE);
-	return success;
-}
-
-/*****************************************************************************/
-
-static char *
-_get_fcn_802_1x_ca_cert (ARGS_GET_FCN)
-{
-	NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
-	char *ca_cert_str = NULL;
-
-	switch (nm_setting_802_1x_get_ca_cert_scheme (s_8021X)) {
-	case NM_SETTING_802_1X_CK_SCHEME_BLOB:
-		ca_cert_str = bytes_to_string (nm_setting_802_1x_get_ca_cert_blob (s_8021X));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_PATH:
-		ca_cert_str = g_strdup (nm_setting_802_1x_get_ca_cert_path (s_8021X));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
-		ca_cert_str = g_strdup (nm_setting_802_1x_get_ca_cert_uri (s_8021X));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
-		break;
-	}
-
-	return ca_cert_str;
-}
-
-static char *
-_get_fcn_802_1x_client_cert (ARGS_GET_FCN)
-{
-	NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
-	char *cert_str = NULL;
-
-	switch (nm_setting_802_1x_get_client_cert_scheme (s_8021X)) {
-	case NM_SETTING_802_1X_CK_SCHEME_BLOB:
-		if (show_secrets)
-			cert_str = bytes_to_string (nm_setting_802_1x_get_client_cert_blob (s_8021X));
-		else
-			cert_str = g_strdup (_(HIDDEN_TEXT));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_PATH:
-		cert_str = g_strdup (nm_setting_802_1x_get_client_cert_path (s_8021X));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
-		cert_str = g_strdup (nm_setting_802_1x_get_client_cert_uri (s_8021X));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
-		break;
-	}
-
-	return cert_str;
-}
-
-static char *
-_get_fcn_802_1x_phase2_ca_cert (ARGS_GET_FCN)
-{
-	NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
-	char *phase2_ca_cert_str = NULL;
-
-	switch (nm_setting_802_1x_get_phase2_ca_cert_scheme (s_8021X)) {
-	case NM_SETTING_802_1X_CK_SCHEME_BLOB:
-		phase2_ca_cert_str = bytes_to_string (nm_setting_802_1x_get_phase2_ca_cert_blob (s_8021X));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_PATH:
-		phase2_ca_cert_str = g_strdup (nm_setting_802_1x_get_phase2_ca_cert_path (s_8021X));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
-		phase2_ca_cert_str = g_strdup (nm_setting_802_1x_get_phase2_ca_cert_uri (s_8021X));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
-		break;
-	}
-
-	return phase2_ca_cert_str;
-}
-
-static char *
-_get_fcn_802_1x_phase2_client_cert (ARGS_GET_FCN)
-{
-	NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
-	char *cert_str = NULL;
-
-	switch (nm_setting_802_1x_get_phase2_client_cert_scheme (s_8021X)) {
-	case NM_SETTING_802_1X_CK_SCHEME_BLOB:
-		if (show_secrets)
-			cert_str = bytes_to_string (nm_setting_802_1x_get_phase2_client_cert_blob (s_8021X));
-		else
-			cert_str = g_strdup (_(HIDDEN_TEXT));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_PATH:
-		cert_str = g_strdup (nm_setting_802_1x_get_phase2_client_cert_path (s_8021X));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
-		cert_str = g_strdup (nm_setting_802_1x_get_phase2_client_cert_uri (s_8021X));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
-		break;
-	}
-
-	return cert_str;
-}
-
-static char *
-_get_fcn_802_1x_password_raw (ARGS_GET_FCN)
-{
-	NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
-	return bytes_to_string (nm_setting_802_1x_get_password_raw (s_8021X));
-}
-
-static char *
-_get_fcn_802_1x_private_key (ARGS_GET_FCN)
-{
-	NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
-	char *key_str = NULL;
-
-	switch (nm_setting_802_1x_get_private_key_scheme (s_8021X)) {
-	case NM_SETTING_802_1X_CK_SCHEME_BLOB:
-		if (show_secrets)
-			key_str = bytes_to_string (nm_setting_802_1x_get_private_key_blob (s_8021X));
-		else
-			key_str = g_strdup (_(HIDDEN_TEXT));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_PATH:
-		key_str = g_strdup (nm_setting_802_1x_get_private_key_path (s_8021X));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
-		key_str = g_strdup (nm_setting_802_1x_get_private_key_uri (s_8021X));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
-		break;
-	}
-
-	return key_str;
-}
-
-static char *
-_get_fcn_802_1x_phase2_private_key (ARGS_GET_FCN)
-{
-	NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
-	char *key_str = NULL;
-
-	switch (nm_setting_802_1x_get_phase2_private_key_scheme (s_8021X)) {
-	case NM_SETTING_802_1X_CK_SCHEME_BLOB:
-		if (show_secrets)
-			key_str = bytes_to_string (nm_setting_802_1x_get_phase2_private_key_blob (s_8021X));
-		else
-			key_str = g_strdup (_(HIDDEN_TEXT));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_PATH:
-		key_str = g_strdup (nm_setting_802_1x_get_phase2_private_key_path (s_8021X));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
-		key_str = g_strdup (nm_setting_802_1x_get_phase2_private_key_uri (s_8021X));
-		break;
-	case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
-		break;
-	}
-
-	return key_str;
-}
-
-#define DEFINE_SETTER_STR_LIST(def_func, set_func) \
-	static gboolean \
-	def_func (ARGS_SET_FCN) \
-	{ \
-		char **strv = NULL; \
-		guint i = 0; \
-		\
-		g_return_val_if_fail (error == NULL || *error == NULL, FALSE); \
-		\
-		strv = nmc_strsplit_set (value, " \t,", 0); \
-		while (strv && strv[i]) \
-			set_func (NM_SETTING_802_1X (setting), strv[i++]); \
-		g_strfreev (strv); \
-		return TRUE; \
-	}
-
-#define DEFINE_SETTER_CERT(def_func, set_func) \
-	static gboolean \
-	def_func (ARGS_SET_FCN) \
-	{ \
-		char *val_strip = g_strstrip (g_strdup (value)); \
-		char *p = val_strip; \
-		NMSetting8021xCKScheme scheme = NM_SETTING_802_1X_CK_SCHEME_PATH; \
-		gboolean success; \
-		\
-		if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11, NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11)) == 0) \
-			scheme = NM_SETTING_802_1X_CK_SCHEME_PKCS11; \
-		else if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) == 0) \
-			p += NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH); \
-		\
-		success = set_func (NM_SETTING_802_1X (setting), p, scheme, NULL, error); \
-		g_free (val_strip); \
-		return success; \
-	}
-
-#define DEFINE_SETTER_PRIV_KEY(def_func, pwd_func, set_func) \
-	static gboolean \
-	def_func (ARGS_SET_FCN) \
-	{ \
-		char **strv = NULL; \
-		char *val_strip = g_strstrip (g_strdup (value)); \
-		char *p = val_strip; \
-		const char *path, *password; \
-		gs_free char *password_free = NULL; \
-		NMSetting8021xCKScheme scheme = NM_SETTING_802_1X_CK_SCHEME_PATH; \
-		gboolean success; \
-		\
-		if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11, NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11)) == 0) \
-			scheme = NM_SETTING_802_1X_CK_SCHEME_PKCS11; \
-		else if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) == 0) \
-			p += NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH); \
-		\
-		strv = nmc_strsplit_set (p, " \t,", 2); \
-		path = strv[0]; \
-		if (g_strv_length (strv) == 2) \
-			password = strv[1]; \
-		else \
-			password = password_free = g_strdup (pwd_func (NM_SETTING_802_1X (setting))); \
-		success = set_func (NM_SETTING_802_1X (setting), path, password, scheme, NULL, error); \
-		g_free (val_strip); \
-		g_strfreev (strv); \
-		return success; \
-	}
-
-static gboolean
-_validate_and_remove_eap_method (NMSetting8021x *setting,
-                                 const char *eap,
-                                 GError **error)
-{
-	gboolean ret;
-
-	ret = nm_setting_802_1x_remove_eap_method_by_value(setting, eap);
-	if (!ret)
-		g_set_error (error, 1, 0, _("the property doesn't contain EAP method '%s'"), eap);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_802_1x_eap,
-                               NM_SETTING_802_1X,
-                               nm_setting_802_1x_get_num_eap_methods,
-                               nm_setting_802_1x_remove_eap_method,
-                               _validate_and_remove_eap_method)
-
-DEFINE_SETTER_CERT (_set_fcn_802_1x_ca_cert, nm_setting_802_1x_set_ca_cert)
-
-DEFINE_SETTER_STR_LIST (_set_fcn_802_1x_altsubject_matches, nm_setting_802_1x_add_altsubject_match)
-
-static gboolean
-_validate_and_remove_altsubject_match (NMSetting8021x *setting,
-                                       const char *altsubject_match,
-                                       GError **error)
-{
-	gboolean ret;
-
-	ret = nm_setting_802_1x_remove_altsubject_match_by_value (setting, altsubject_match);
-	if (!ret)
-		g_set_error (error, 1, 0,
-		             _("the property doesn't contain alternative subject match '%s'"),
-		             altsubject_match);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_802_1x_altsubject_matches,
-                               NM_SETTING_802_1X,
-                               nm_setting_802_1x_get_num_altsubject_matches,
-                               nm_setting_802_1x_remove_altsubject_match,
-                               _validate_and_remove_altsubject_match)
-
-DEFINE_SETTER_CERT (_set_fcn_802_1x_client_cert, nm_setting_802_1x_set_client_cert)
-
-DEFINE_SETTER_CERT (_set_fcn_802_1x_phase2_ca_cert, nm_setting_802_1x_set_phase2_ca_cert)
-
-DEFINE_SETTER_STR_LIST (_set_fcn_802_1x_phase2_altsubject_matches, nm_setting_802_1x_add_phase2_altsubject_match)
-
-static gboolean
-_validate_and_remove_phase2_altsubject_match (NMSetting8021x *setting,
-                                              const char *phase2_altsubject_match,
-                                              GError **error)
-{
-	gboolean ret;
-
-	ret = nm_setting_802_1x_remove_phase2_altsubject_match_by_value (setting, phase2_altsubject_match);
-	if (!ret)
-		g_set_error (error, 1, 0,
-		             _("the property doesn't contain \"phase2\" alternative subject match '%s'"),
-		             phase2_altsubject_match);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_802_1x_phase2_altsubject_matches,
-                               NM_SETTING_802_1X,
-                               nm_setting_802_1x_get_num_phase2_altsubject_matches,
-                               nm_setting_802_1x_remove_phase2_altsubject_match,
-                               _validate_and_remove_phase2_altsubject_match)
-
-DEFINE_SETTER_CERT (_set_fcn_802_1x_phase2_client_cert, nm_setting_802_1x_set_phase2_client_cert)
-
-DEFINE_SETTER_PRIV_KEY (_set_fcn_802_1x_private_key,
-                        nm_setting_802_1x_get_private_key_password,
-                        nm_setting_802_1x_set_private_key)
-
-DEFINE_SETTER_PRIV_KEY (_set_fcn_802_1x_phase2_private_key,
-                        nm_setting_802_1x_get_phase2_private_key_password,
-                        nm_setting_802_1x_set_phase2_private_key)
-
-static gboolean
-_set_fcn_802_1x_password_raw (ARGS_SET_FCN)
-{
-	return nmc_property_set_byte_array (setting, property_info->property_name, value, error);
-}
-
-static char *
-_get_fcn_802_1x_phase1_auth_flags (ARGS_GET_FCN)
-{
-	NMSetting8021x *s_8021x = NM_SETTING_802_1X (setting);
-	NMSetting8021xAuthFlags flags;
-	char *tmp, *str;
-
-	flags = nm_setting_802_1x_get_phase1_auth_flags (s_8021x);
-	tmp = nm_utils_enum_to_str (nm_setting_802_1x_auth_flags_get_type (), flags);
-	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
-		str = g_strdup_printf ("%s", tmp && *tmp ? tmp : "none");
-	else
-		str = g_strdup_printf ("%d (%s)", flags, tmp && *tmp ? tmp : "none");
-	g_free (tmp);
-	return str;
-}
-
-static gboolean
-_set_fcn_802_1x_phase1_auth_flags (ARGS_SET_FCN)
-{
-	NMSetting8021xAuthFlags flags;
-	gs_free char *err_token = NULL;
-	gboolean ret;
-	long int t;
-
-	if (nmc_string_to_int_base (value, 0, TRUE,
-	                            NM_SETTING_802_1X_AUTH_FLAGS_NONE,
-	                            NM_SETTING_802_1X_AUTH_FLAGS_ALL,
-	                            &t))
-		flags = (NMSetting8021xAuthFlags) t;
-	else {
-		ret = nm_utils_enum_from_str (nm_setting_802_1x_auth_flags_get_type (), value,
-		                              (int *) &flags, &err_token);
-
-		if (!ret) {
-			if (g_ascii_strcasecmp (err_token, "none") == 0)
-				flags = NM_SETTING_802_1X_AUTH_FLAGS_NONE;
-			else {
-				g_set_error (error, 1, 0, _("invalid option '%s', use a combination of [%s]"),
-				             err_token,
-				             nm_utils_enum_to_str (nm_setting_802_1x_auth_flags_get_type (),
-				                                   NM_SETTING_802_1X_AUTH_FLAGS_ALL));
-				return FALSE;
-			}
-		}
-	}
-
-	g_object_set (setting, property_info->property_name, (guint) flags, NULL);
-	return TRUE;
-}
-
-static char *
-_get_fcn_bond_options (ARGS_GET_FCN)
-{
-	NMSettingBond *s_bond = NM_SETTING_BOND (setting);
-	GString *bond_options_s;
-	int i;
-
-	bond_options_s = g_string_new (NULL);
-	for (i = 0; i < nm_setting_bond_get_num_options (s_bond); i++) {
-		const char *key, *value;
-		gs_free char *tmp_value = NULL;
-		char *p;
-
-		nm_setting_bond_get_option (s_bond, i, &key, &value);
-
-		if (nm_streq0 (key, NM_SETTING_BOND_OPTION_ARP_IP_TARGET)) {
-			value = tmp_value = g_strdup (value);
-			for (p = tmp_value; p && *p; p++) {
-				if (*p == ',')
-					*p = ' ';
-			}
-		}
-
-		g_string_append_printf (bond_options_s, "%s=%s,", key, value);
-	}
-	g_string_truncate (bond_options_s, bond_options_s->len-1);  /* chop off trailing ',' */
-
-	return g_string_free (bond_options_s, FALSE);
-}
-
-/*  example: miimon=100,mode=balance-rr, updelay=5 */
-static gboolean
-_validate_and_remove_bond_option (NMSettingBond *setting, const char *option)
-{
-	const char *opt;
-	const char **valid_options;
-
-	valid_options = nm_setting_bond_get_valid_options (setting);
-	opt = nmc_string_is_valid (option, valid_options, NULL);
-
-	if (opt)
-		return nm_setting_bond_remove_option (setting, opt);
-	else
-		return FALSE;
-}
-
-static const char *
-_validate_bond_option_value (const char *option, const char *value, GError **error)
-{
-	if (!g_strcmp0 (option, NM_SETTING_BOND_OPTION_MODE))
-		return nmc_bond_validate_mode (value, error);
-
-	return value;
-}
-
-static gboolean
-_bond_add_option (NMSettingBond *setting,
-                  const char *name,
-                  const char *value)
-{
-	gs_free char *tmp_value = NULL;
-	char *p;
-
-	if (nm_streq0 (name, NM_SETTING_BOND_OPTION_ARP_IP_TARGET)) {
-		value = tmp_value = g_strdup (value);
-		for (p = tmp_value; p && *p; p++)
-			if (*p == ' ')
-				*p = ',';
-	}
-
-	return nm_setting_bond_add_option (setting, name, value);
-}
-
-DEFINE_SETTER_OPTIONS (_set_fcn_bond_options,
-                       NM_SETTING_BOND,
-                       NMSettingBond,
-                       _bond_add_option,
-                       nm_setting_bond_get_valid_options,
-                       _validate_bond_option_value)
-DEFINE_REMOVER_OPTION (_remove_fcn_bond_options,
-                       NM_SETTING_BOND,
-                       _validate_and_remove_bond_option)
-
-static const char *
-_describe_fcn_bond_options (ARGS_DESCRIBE_FCN)
-{
-	gs_free char *options_str = NULL;
-	const char **valid_options;
-	char *s;
-
-	valid_options = nm_setting_bond_get_valid_options (NULL);
-	options_str = g_strjoinv (", ", (char **) valid_options);
-
-	s = g_strdup_printf (_("Enter a list of bonding options formatted as:\n"
-	                       "  option = <value>, option = <value>,... \n"
-	                       "Valid options are: %s\n"
-	                       "'mode' can be provided as a name or a number:\n"
-	                       "balance-rr    = 0\n"
-	                       "active-backup = 1\n"
-	                       "balance-xor   = 2\n"
-	                       "broadcast     = 3\n"
-	                       "802.3ad       = 4\n"
-	                       "balance-tlb   = 5\n"
-	                       "balance-alb   = 6\n\n"
-	                       "Example: mode=2,miimon=120\n"), options_str);
-	return (*out_to_free = s);
-}
-
-static const char *const*
-_values_fcn_bond_options (ARGS_VALUES_FCN)
-{
-	return nm_setting_bond_get_valid_options (NULL);
-}
-
-static char *
-_get_fcn_connection_autoconnect_retires (ARGS_GET_FCN)
-{
-	NMSettingConnection *s_con = NM_SETTING_CONNECTION (setting);
-	gint retries;
-
-	retries = nm_setting_connection_get_autoconnect_retries (s_con);
-	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
-		return g_strdup_printf ("%d", retries);
-
-	switch (retries) {
-	case -1:
-		return g_strdup_printf (_("%d (default)"), retries);
-	case 0:
-		return g_strdup_printf (_("%d (forever)"), retries);
-	default:
-		return g_strdup_printf ("%d", retries);
-	}
-}
-
-static char *
-_get_fcn_connection_permissions (ARGS_GET_FCN)
-{
-	NMSettingConnection *s_con = NM_SETTING_CONNECTION (setting);
-	GString *perm = NULL;
-	const char *perm_item;
-	const char *perm_type;
-	int i;
-
-	perm = g_string_new (NULL);
-	for (i = 0; i < nm_setting_connection_get_num_permissions (s_con); i++) {
-		if (nm_setting_connection_get_permission (s_con, i, &perm_type, &perm_item, NULL))
-			g_string_append_printf (perm, "%s:%s,", perm_type, perm_item);
-	}
-	if (perm->len > 0) {
-		g_string_truncate (perm, perm->len-1); /* remove trailing , */
-		return g_string_free (perm, FALSE);
-	}
-
-	/* No value from get_permission */
-	return g_string_free (perm, TRUE);
-}
-
-static char *
-_get_fcn_connection_autoconnect_slaves (ARGS_GET_FCN)
-{
-	NMSettingConnection *s_con = NM_SETTING_CONNECTION (setting);
-	return autoconnect_slaves_to_string (nm_setting_connection_get_autoconnect_slaves (s_con), get_type);
-}
-
-static gboolean
-_set_fcn_connection_type (ARGS_SET_FCN)
-{
-	gs_free char *uuid = NULL;
-
-	if (nm_setting_connection_get_uuid (NM_SETTING_CONNECTION (setting))) {
-		/* Don't allow setting type unless the connection is brand new.
-		 * Just because it's a bad idea and the user wouldn't probably want that.
-		 * No technical reason, really.
-		 * Also, using uuid to see if the connection is brand new is a bit
-		 * hacky: we can not see if the type is already set, because
-		 * nmc_setting_set_property() is called only after the property
-		 * we're setting (type) has been removed. */
-		g_set_error (error, 1, 0, _("Can not change the connection type"));
-		return FALSE;
-	}
-
-	uuid = nm_utils_uuid_generate ();
-	g_object_set (G_OBJECT (setting),
-	              NM_SETTING_CONNECTION_UUID, uuid,
-	              NULL);
-
-	g_object_set (G_OBJECT (setting), property_info->property_name, value, NULL);
-	return TRUE;
-}
-
-/* define from libnm-core/nm-setting-connection.c */
-#define PERM_USER_PREFIX  "user:"
-
-static gboolean
-permissions_valid (const char *perm)
-{
-	if (!perm || perm[0] == '\0')
-		return FALSE;
-
-	if (strncmp (perm, PERM_USER_PREFIX, strlen (PERM_USER_PREFIX)) == 0) {
-		if (   strlen (perm) <= strlen (PERM_USER_PREFIX)
-		    || strchr (perm + strlen (PERM_USER_PREFIX), ':'))
-			return  FALSE;
-	} else {
-		if (strchr (perm, ':'))
-			return  FALSE;
-	}
-
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_connection_permissions (ARGS_SET_FCN)
-{
-	char **strv = NULL;
-	guint i = 0;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (value, " \t,", 0);
-	if (!verify_string_list (strv, property_info->property_name, permissions_valid, error)) {
-		g_strfreev (strv);
-		return FALSE;
-	}
-
-	for (i = 0; strv && strv[i]; i++) {
-		const char *user;
-
-		if (strncmp (strv[i], PERM_USER_PREFIX, strlen (PERM_USER_PREFIX)) == 0)
-			user = strv[i]+strlen (PERM_USER_PREFIX);
-		else
-			user = strv[i];
-
-		nm_setting_connection_add_permission (NM_SETTING_CONNECTION (setting), "user", user, NULL);
-	}
-
-	return TRUE;
-}
-
-static gboolean
-_validate_and_remove_connection_permission (NMSettingConnection *setting,
-                                            const char *perm,
-                                            GError **error)
-{
-	gboolean ret;
-
-	ret = nm_setting_connection_remove_permission_by_value (setting, "user", perm, NULL);
-	if (!ret)
-		g_set_error (error, 1, 0, _("the property doesn't contain permission '%s'"), perm);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_connection_permissions,
-                               NM_SETTING_CONNECTION,
-                               nm_setting_connection_get_num_permissions,
-                               nm_setting_connection_remove_permission,
-                               _validate_and_remove_connection_permission)
-
-static gboolean
-_set_fcn_connection_master (ARGS_SET_FCN)
-{
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!value)
-		;
-	else if (!*value)
-		value = NULL;
-	else if (   !nm_utils_is_valid_iface_name (value, NULL)
-	         && !nm_utils_is_uuid (value)) {
-		g_set_error (error, 1, 0,
-		             _("'%s' is not valid master; use ifname or connection UUID"),
-		             value);
-		return FALSE;
-	}
-	g_object_set (setting, property_info->property_name, value, NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_connection_secondaries (ARGS_SET_FCN)
-{
-	const GPtrArray *connections;
-	NMConnection *con;
-	char **strv = NULL, **iter;
-	guint i = 0;
-
-	connections = nm_client_get_connections (nm_cli.client);
-	strv = nmc_strsplit_set (value, " \t,", 0);
-	for (iter = strv; iter && *iter; iter++) {
-		if (**iter == '\0')
-			continue;
-
-		if (nm_utils_is_uuid (*iter)) {
-			con = nmc_find_connection (connections, "uuid", *iter, NULL, FALSE);
-			if (!con)
-				g_print (_("Warning: %s is not an UUID of any existing connection profile\n"), *iter);
-			else {
-				/* Currenly NM only supports VPN connections as secondaries */
-				if (!nm_connection_is_type (con, NM_SETTING_VPN_SETTING_NAME)) {
-					g_set_error (error, 1, 0, _("'%s' is not a VPN connection profile"), *iter);
-					g_strfreev (strv);
-					return FALSE;
-				}
-			}
-		} else {
-			con = nmc_find_connection (connections, "id", *iter, NULL, FALSE);
-			if (!con) {
-				g_set_error (error, 1, 0, _("'%s' is not a name of any exiting profile"), *iter);
-				g_strfreev (strv);
-				return FALSE;
-			}
-
-			/* Currenly NM only supports VPN connections as secondaries */
-			if (!nm_connection_is_type (con, NM_SETTING_VPN_SETTING_NAME)) {
-				g_set_error (error, 1, 0, _("'%s' is not a VPN connection profile"), *iter);
-				g_strfreev (strv);
-				return FALSE;
-			}
-
-			/* translate id to uuid */
-			g_free (*iter);
-			*iter = g_strdup (nm_connection_get_uuid (con));
-		}
-	}
-
-	while (strv && strv[i])
-		nm_setting_connection_add_secondary (NM_SETTING_CONNECTION (setting), strv[i++]);
-	g_strfreev (strv);
-
-	return TRUE;
-}
-
-static gboolean
-_validate_and_remove_connection_secondary (NMSettingConnection *setting,
-                                           const char *secondary_uuid,
-                                           GError **error)
-{
-	gboolean ret;
-
-	if (!nm_utils_is_uuid (secondary_uuid)) {
-		g_set_error (error, 1, 0,
-		             _("the value '%s' is not a valid UUID"), secondary_uuid);
-		return FALSE;
-	}
-
-	ret = nm_setting_connection_remove_secondary_by_value (setting, secondary_uuid);
-	if (!ret)
-		g_set_error (error, 1, 0,
-		             _("the property doesn't contain UUID '%s'"), secondary_uuid);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_connection_secondaries,
-                               NM_SETTING_CONNECTION,
-                               nm_setting_connection_get_num_secondaries,
-                               nm_setting_connection_remove_secondary,
-                               _validate_and_remove_connection_secondary)
-
-static char *
-_get_fcn_connection_metered (ARGS_GET_FCN)
-{
-	NMSettingConnection *s_conn = NM_SETTING_CONNECTION (setting);
-
-	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE) {
-		switch (nm_setting_connection_get_metered (s_conn)) {
-		case NM_METERED_YES:
-			return g_strdup ("yes");
-		case NM_METERED_NO:
-			return g_strdup ("no");
-		case NM_METERED_UNKNOWN:
-		default:
-			return g_strdup ("unknown");
-		}
-	}
-	switch (nm_setting_connection_get_metered (s_conn)) {
-	case NM_METERED_YES:
-		return g_strdup (_("yes"));
-	case NM_METERED_NO:
-		return g_strdup (_("no"));
-	case NM_METERED_UNKNOWN:
-	default:
-		return g_strdup (_("unknown"));
-	}
-}
-
-static gboolean
-_set_fcn_connection_metered (ARGS_SET_FCN)
-{
-	NMMetered metered;
-	NMCTriStateValue ts_val;
-
-	if (!nmc_string_to_tristate (value, &ts_val, error))
-		return FALSE;
-
-	switch (ts_val) {
-	case NMC_TRI_STATE_YES:
-		metered = NM_METERED_YES;
-		break;
-	case NMC_TRI_STATE_NO:
-		metered = NM_METERED_NO;
-		break;
-	case NMC_TRI_STATE_UNKNOWN:
-		metered = NM_METERED_UNKNOWN;
-		break;
-	default:
-		g_assert_not_reached();
-	}
-
-	g_object_set (setting, property_info->property_name, metered, NULL);
-	return TRUE;
-}
-
-static char *
-_get_fcn_connection_lldp (ARGS_GET_FCN)
-{
-	NMSettingConnection *s_conn = NM_SETTING_CONNECTION (setting);
-	NMSettingConnectionLldp lldp;
-	char *tmp, *str;
-
-	lldp = nm_setting_connection_get_lldp (s_conn);
-	tmp = nm_utils_enum_to_str (nm_setting_connection_lldp_get_type (), lldp);
-	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
-		str = g_strdup_printf ("%s", tmp && *tmp ? tmp : "default");
-	else
-		str = g_strdup_printf ("%d (%s)", lldp, tmp && *tmp ? tmp : "default");
-	g_free (tmp);
-	return str;
-}
-
-static gboolean
-_set_fcn_connection_lldp (ARGS_SET_FCN)
-{
-	NMSettingConnectionLldp lldp;
-	gboolean ret;
-	long int t;
-
-	if (nmc_string_to_int_base (value, 0, TRUE,
-	                           NM_SETTING_CONNECTION_LLDP_DEFAULT,
-	                           NM_SETTING_CONNECTION_LLDP_ENABLE_RX,
-	                           &t))
-		lldp = t;
-	else {
-		ret = nm_utils_enum_from_str (nm_setting_connection_lldp_get_type (), value,
-		                              (int *) &lldp, NULL);
-
-		if (!ret) {
-			if (g_ascii_strcasecmp (value, "enable") == 0)
-				lldp = NM_SETTING_CONNECTION_LLDP_ENABLE_RX;
-			else {
-				g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
-				             value, "default,disable,enable-rx,enable");
-				return FALSE;
-			}
-		}
-	}
-
-	g_object_set (setting, property_info->property_name, lldp, NULL);
-	return TRUE;
-}
-
-static char *
-dcb_flags_to_string (NMSettingDcbFlags flags)
-{
-	GString *flag_str;
-
-	if (flags == 0)
-		return g_strdup (_("0 (disabled)"));
-
-	flag_str = g_string_new (NULL);
-	g_string_printf (flag_str, "%d (", flags);
-
-	if (flags & NM_SETTING_DCB_FLAG_ENABLE)
-		g_string_append (flag_str, _("enabled, "));
-	if (flags & NM_SETTING_DCB_FLAG_ADVERTISE)
-		g_string_append (flag_str, _("advertise, "));
-	if (flags & NM_SETTING_DCB_FLAG_WILLING)
-		g_string_append (flag_str, _("willing, "));
-
-	if (flag_str->str[flag_str->len-1] == '(')
-		g_string_append (flag_str, _("unknown"));
-	else
-		g_string_truncate (flag_str, flag_str->len-2);  /* chop off trailing ', ' */
-
-	g_string_append_c (flag_str, ')');
-
-	return g_string_free (flag_str, FALSE);
-}
-
-#define DEFINE_DCB_FLAGS_GETTER(func_name, property_name) \
-	static char * \
-	func_name (ARGS_GET_FCN) \
-	{ \
-		guint v; \
-		GValue val = G_VALUE_INIT; \
-		g_value_init (&val, G_TYPE_UINT); \
-		g_object_get_property (G_OBJECT (setting), property_name, &val); \
-		v = g_value_get_uint (&val); \
-		g_value_unset (&val); \
-		return dcb_flags_to_string (v); \
-	}
-
-static char *
-dcb_app_priority_to_string (gint priority)
-{
-	return (priority == -1) ? g_strdup (_("-1 (unset)")) : g_strdup_printf ("%d", priority);
-}
-
-#define DEFINE_DCB_APP_PRIORITY_GETTER(func_name, property_name) \
-	static char * \
-	func_name (ARGS_GET_FCN) \
-	{ \
-		int v; \
-		GValue val = G_VALUE_INIT; \
-		g_value_init (&val, G_TYPE_INT); \
-		g_object_get_property (G_OBJECT (setting), property_name, &val); \
-		v = g_value_get_int (&val); \
-		g_value_unset (&val); \
-		return dcb_app_priority_to_string (v); \
-	}
-
-#define DEFINE_DCB_BOOL_GETTER(func_name, getter_func_name) \
-	static char * \
-	func_name (ARGS_GET_FCN) \
-	{ \
-		NMSettingDcb *s_dcb = NM_SETTING_DCB (setting); \
-		GString *str; \
-		guint i; \
-\
-		str = g_string_new (NULL); \
-		for (i = 0; i < 8; i++) { \
-			if (getter_func_name (s_dcb,  i)) \
-				g_string_append_c (str, '1'); \
-			else \
-				g_string_append_c (str, '0'); \
-\
-			if (i < 7) \
-				g_string_append_c (str, ','); \
-		} \
-\
-		return g_string_free (str, FALSE); \
-	}
-
-#define DEFINE_DCB_UINT_GETTER(func_name, getter_func_name) \
-	static char * \
-	func_name (ARGS_GET_FCN) \
-	{ \
-		NMSettingDcb *s_dcb = NM_SETTING_DCB (setting); \
-		GString *str; \
-		guint i; \
- \
-		str = g_string_new (NULL); \
-		for (i = 0; i < 8; i++) { \
-			g_string_append_printf (str, "%u", getter_func_name (s_dcb, i)); \
-			if (i < 7) \
-				g_string_append_c (str, ','); \
-		} \
-\
-		return g_string_free (str, FALSE); \
-	}
-
-DEFINE_DCB_FLAGS_GETTER (_get_fcn_dcb_app_fcoe_flags, NM_SETTING_DCB_APP_FCOE_FLAGS)
-DEFINE_DCB_APP_PRIORITY_GETTER (_get_fcn_dcb_app_fcoe_priority, NM_SETTING_DCB_APP_FCOE_PRIORITY)
-DEFINE_DCB_FLAGS_GETTER (_get_fcn_dcb_app_iscsi_flags, NM_SETTING_DCB_APP_ISCSI_FLAGS)
-DEFINE_DCB_APP_PRIORITY_GETTER (_get_fcn_dcb_app_iscsi_priority, NM_SETTING_DCB_APP_ISCSI_PRIORITY)
-DEFINE_DCB_FLAGS_GETTER (_get_fcn_dcb_app_fip_flags, NM_SETTING_DCB_APP_FIP_FLAGS)
-DEFINE_DCB_APP_PRIORITY_GETTER (_get_fcn_dcb_app_fip_priority, NM_SETTING_DCB_APP_FIP_PRIORITY)
-
-DEFINE_DCB_FLAGS_GETTER (_get_fcn_dcb_priority_flow_control_flags, NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS)
-DEFINE_DCB_BOOL_GETTER (_get_fcn_dcb_priority_flow_control, nm_setting_dcb_get_priority_flow_control)
-
-DEFINE_DCB_FLAGS_GETTER (_get_fcn_dcb_priority_group_flags, NM_SETTING_DCB_PRIORITY_GROUP_FLAGS)
-DEFINE_DCB_UINT_GETTER (_get_fcn_dcb_priority_group_id, nm_setting_dcb_get_priority_group_id)
-DEFINE_DCB_UINT_GETTER (_get_fcn_dcb_priority_group_bandwidth, nm_setting_dcb_get_priority_group_bandwidth)
-DEFINE_DCB_UINT_GETTER (_get_fcn_dcb_priority_bandwidth, nm_setting_dcb_get_priority_bandwidth)
-DEFINE_DCB_BOOL_GETTER (_get_fcn_dcb_priority_strict, nm_setting_dcb_get_priority_strict_bandwidth)
-DEFINE_DCB_UINT_GETTER (_get_fcn_dcb_priority_traffic_class, nm_setting_dcb_get_priority_traffic_class)
-
-#define DCB_ALL_FLAGS (NM_SETTING_DCB_FLAG_ENABLE | NM_SETTING_DCB_FLAG_ADVERTISE | NM_SETTING_DCB_FLAG_WILLING)
-
-static gboolean
-_set_fcn_dcb_flags (ARGS_SET_FCN)
-{
-	char **strv = NULL, **iter;
-	NMSettingDcbFlags flags = NM_SETTING_DCB_FLAG_NONE;
-	long int t;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	/* Check for overall hex numeric value */
-	if (nmc_string_to_int_base (value, 0, TRUE, 0, DCB_ALL_FLAGS, &t))
-		flags = (guint) t;
-	else {
-		/* Check for individual flag numbers */
-		strv = nmc_strsplit_set (value, " \t,", 0);
-		for (iter = strv; iter && *iter; iter++) {
-			if (!nmc_string_to_int_base (*iter, 0, TRUE, 0, DCB_ALL_FLAGS, &t))
-				t = -1;
-
-			if (   g_ascii_strcasecmp (*iter, "enable") == 0
-			    || g_ascii_strcasecmp (*iter, "enabled") == 0
-			    || t == NM_SETTING_DCB_FLAG_ENABLE)
-				flags |= NM_SETTING_DCB_FLAG_ENABLE;
-			else if (   g_ascii_strcasecmp (*iter, "advertise") == 0
-				 || t == NM_SETTING_DCB_FLAG_ADVERTISE)
-				flags |= NM_SETTING_DCB_FLAG_ADVERTISE;
-			else if (   g_ascii_strcasecmp (*iter, "willing") == 0
-				 || t == NM_SETTING_DCB_FLAG_WILLING)
-				flags |= NM_SETTING_DCB_FLAG_WILLING;
-			else if (   g_ascii_strcasecmp (*iter, "disable") == 0
-				 || g_ascii_strcasecmp (*iter, "disabled") == 0
-				 || t == 0) {
-				/* pass */
-			} else {
-				g_set_error (error, 1, 0, _("'%s' is not a valid DCB flag"), *iter);
-				return FALSE;
-			}
-		}
-		g_strfreev (strv);
-	}
-
-	/* Validate the flags according to the property spec */
-	if (!validate_flags (setting, property_info->property_name, (guint) flags, error))
-		return FALSE;
-
-	g_object_set (setting, property_info->property_name, (guint) flags, NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_dcb_priority (ARGS_SET_FCN)
-{
-	long int priority = 0;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_int (value, FALSE, -1, 7, &priority)) {
-		g_set_error (error, 1, 0, _("'%s' is not a DCB app priority"), value);
-		return FALSE;
-	}
-
-	/* Validate the number according to the property spec */
-	if (!validate_int (setting, property_info->property_name, (gint) priority, error))
-		return FALSE;
-
-	g_object_set (setting, property_info->property_name, (gint) priority, NULL);
-	return TRUE;
-}
-
-static gboolean
-dcb_parse_uint_array (const char *val,
-                      guint max,
-                      guint other,
-                      guint *out_array,
-                      GError **error)
-{
-	char **items, **iter;
-	guint i = 0;
-
-	g_return_val_if_fail (out_array != NULL, FALSE);
-
-	items = g_strsplit_set (val, ",", -1);
-	if (g_strv_length (items) != 8) {
-		g_set_error_literal (error, 1, 0, _("must contain 8 comma-separated numbers"));
-		goto error;
-	}
-
-	for (iter = items; iter && *iter; iter++) {
-		long int num = 0;
-		gboolean success;
-
-		*iter = g_strstrip (*iter);
-		success = nmc_string_to_int_base (*iter, 10, TRUE, 0, other ? other : max, &num);
-
-		/* If number is greater than 'max' it must equal 'other' */
-		if (success && other && (num > max) && (num != other))
-			success = FALSE;
-
-		if (!success) {
-			if (other) {
-				g_set_error (error, 1, 0, _("'%s' not a number between 0 and %u (inclusive) or %u"),
-					     *iter, max, other);
-			} else {
-				g_set_error (error, 1, 0, _("'%s' not a number between 0 and %u (inclusive)"),
-					     *iter, max);
-			}
-			goto error;
-		}
-		out_array[i++] = (guint) num;
-	}
-
-	return TRUE;
-
-error:
-	g_strfreev (items);
-	return FALSE;
-}
-
-static void
-dcb_check_feature_enabled (NMSettingDcb *s_dcb, const char *flags_prop)
-{
-	NMSettingDcbFlags flags = NM_SETTING_DCB_FLAG_NONE;
-
-	g_object_get (s_dcb, flags_prop, &flags, NULL);
-	if (!(flags & NM_SETTING_DCB_FLAG_ENABLE))
-		g_print (_("Warning: changes will have no effect until '%s' includes 1 (enabled)\n\n"), flags_prop);
-}
-
-static gboolean
-_set_fcn_dcb_priority_flow_control (ARGS_SET_FCN)
-{
-	guint i = 0;
-	guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!dcb_parse_uint_array (value, 1, 0, nums, error))
-		return FALSE;
-
-	for (i = 0; i < 8; i++)
-		nm_setting_dcb_set_priority_flow_control (NM_SETTING_DCB (setting), i, !!nums[i]);
-
-	dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_dcb_priority_group_id (ARGS_SET_FCN)
-{
-	guint i = 0;
-	guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!dcb_parse_uint_array (value, 7, 15, nums, error))
-		return FALSE;
-
-	for (i = 0; i < 8; i++)
-		nm_setting_dcb_set_priority_group_id (NM_SETTING_DCB (setting), i, nums[i]);
-
-	dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_GROUP_FLAGS);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_dcb_priority_group_bandwidth (ARGS_SET_FCN)
-{
-	guint i = 0, sum = 0;
-	guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!dcb_parse_uint_array (value, 100, 0, nums, error))
-		return FALSE;
-
-	for (i = 0; i < 8; i++)
-		sum += nums[i];
-	if (sum != 100) {
-		g_set_error_literal (error, 1, 0, _("bandwidth percentages must total 100%%"));
-		return FALSE;
-	}
-
-	for (i = 0; i < 8; i++)
-		nm_setting_dcb_set_priority_group_bandwidth (NM_SETTING_DCB (setting), i, nums[i]);
-
-	dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_GROUP_FLAGS);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_dcb_priority_bandwidth (ARGS_SET_FCN)
-{
-	guint i = 0;
-	guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!dcb_parse_uint_array (value, 100, 0, nums, error))
-		return FALSE;
-
-	for (i = 0; i < 8; i++)
-		nm_setting_dcb_set_priority_bandwidth (NM_SETTING_DCB (setting), i, nums[i]);
-
-	dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_GROUP_FLAGS);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_dcb_priority_strict (ARGS_SET_FCN)
-{
-	guint i = 0;
-	guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!dcb_parse_uint_array (value, 1, 0, nums, error))
-		return FALSE;
-
-	for (i = 0; i < 8; i++)
-		nm_setting_dcb_set_priority_strict_bandwidth (NM_SETTING_DCB (setting), i, !!nums[i]);
-
-	dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_GROUP_FLAGS);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_dcb_priority_traffic_class (ARGS_SET_FCN)
-{
-	guint i = 0;
-	guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!dcb_parse_uint_array (value, 7, 0, nums, error))
-		return FALSE;
-
-	for (i = 0; i < 8; i++)
-		nm_setting_dcb_set_priority_traffic_class (NM_SETTING_DCB (setting), i, nums[i]);
-
-	dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_GROUP_FLAGS);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_gsm_sim_operator_id (ARGS_SET_FCN)
-{
-	const char *p = value;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (strlen (value) != 5 && strlen (value) != 6) {
-		g_set_error_literal (error, 1, 0, _("SIM operator ID must be a 5 or 6 number MCCMNC code"));
-		return FALSE;
-	}
-
-	while (p && *p) {
-		if (!g_ascii_isdigit (*p++)) {
-			g_set_error_literal (error, 1, 0, _("SIM operator ID must be a 5 or 6 number MCCMNC code"));
-			return FALSE;
-		}
-	}
-	g_object_set (G_OBJECT (setting),
-	              NM_SETTING_GSM_SIM_OPERATOR_ID,
-	              value,
-	              NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_infiniband_p_key (ARGS_SET_FCN)
-{
-	gboolean p_key_valid = FALSE;
-	long p_key_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!strncasecmp (value, "0x", 2))
-		p_key_valid = nmc_string_to_int_base (value + 2, 16, TRUE, 0, G_MAXUINT16, &p_key_int);
-	else
-		p_key_valid = nmc_string_to_int (value, TRUE, -1, G_MAXUINT16, &p_key_int);
-
-	if (!p_key_valid) {
-		if (strcmp (value, "default") == 0)
-			p_key_int = -1;
-		else {
-			g_set_error (error, 1, 0, _("'%s' is not a valid IBoIP P_Key"), value);
-			return FALSE;
-		}
-	}
-	g_object_set (setting, property_info->property_name, (gint) p_key_int, NULL);
-	return TRUE;
-}
-
-
-static char *
-_get_fcn_infiniband_p_key (ARGS_GET_FCN)
-{
-	NMSettingInfiniband *s_infiniband = NM_SETTING_INFINIBAND (setting);
-	int p_key;
-
-	p_key = nm_setting_infiniband_get_p_key (s_infiniband);
-	if (p_key == -1) {
-		if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
-			return g_strdup ("default");
-		else
-			return g_strdup (_("default"));
-	} else
-		return g_strdup_printf ("0x%04x", p_key);
-}
-
-static char *
-_get_fcn_ip_tunnel_mode (ARGS_GET_FCN)
-{
-	NMSettingIPTunnel *s_ip_tunnel = NM_SETTING_IP_TUNNEL (setting);
-	NMIPTunnelMode mode;
-
-	mode = nm_setting_ip_tunnel_get_mode (s_ip_tunnel);
-	return nm_utils_enum_to_str (nm_ip_tunnel_mode_get_type (), mode);
-}
-
-static gboolean
-_set_fcn_ip_tunnel_mode (ARGS_SET_FCN)
-{
-	NMIPTunnelMode mode;
-	gboolean ret;
-
-	ret = nm_utils_enum_from_str (nm_ip_tunnel_mode_get_type(), value,
-	                              (int *) &mode, NULL);
-
-	if (!ret) {
-		gs_free const char **values = NULL;
-		gs_free char *values_str = NULL;
-
-		values = nm_utils_enum_get_values (nm_ip_tunnel_mode_get_type (),
-		                                   NM_IP_TUNNEL_MODE_UNKNOWN + 1,
-		                                   G_MAXINT);
-		values_str = g_strjoinv (",", (char **) values);
-		g_set_error (error, 1, 0, _("invalid mode '%s', use one of %s"),
-		             value, values_str);
-
-		return FALSE;
-	}
-
-	g_object_set (setting, property_info->property_name, mode, NULL);
-	return TRUE;
-}
-
-static NMIPAddress *
-_parse_ip_address (int family, const char *address, GError **error)
-{
-	char *value = g_strdup (address);
-	NMIPAddress *ipaddr;
-
-	ipaddr = nmc_parse_and_build_address (family, g_strstrip (value), error);
-	g_free (value);
-	return ipaddr;
-}
-
-static char *
-_get_fcn_ip_config_addresses (ARGS_GET_FCN)
-{
-	NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting);
-	GString *printable;
-	guint32 num_addresses, i;
-	NMIPAddress *addr;
-
-	printable = g_string_new (NULL);
-
-	num_addresses = nm_setting_ip_config_get_num_addresses (s_ip);
-	for (i = 0; i < num_addresses; i++) {
-		addr = nm_setting_ip_config_get_address (s_ip, i);
-
-		if (printable->len > 0)
-			g_string_append (printable, ", ");
-
-		g_string_append_printf (printable, "%s/%u",
-		                        nm_ip_address_get_address (addr),
-		                        nm_ip_address_get_prefix (addr));
-	}
-
-	return g_string_free (printable, FALSE);
-}
-
-static char *
-_get_fcn_ip_config_routes (ARGS_GET_FCN)
-{
-	NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting);
-	GString *printable;
-	guint32 num_routes, i;
-	NMIPRoute *route;
-
-	printable = g_string_new (NULL);
-
-	num_routes = nm_setting_ip_config_get_num_routes (s_ip);
-	for (i = 0; i < num_routes; i++) {
-		gs_free char *attr_str = NULL;
-		gs_strfreev char **attr_names = NULL;
-		gs_unref_hashtable GHashTable *hash = g_hash_table_new (g_str_hash, g_str_equal);
-		int j;
-
-		route = nm_setting_ip_config_get_route (s_ip, i);
-
-		attr_names = nm_ip_route_get_attribute_names (route);
-		for (j = 0; attr_names && attr_names[j]; j++) {
-			g_hash_table_insert (hash, attr_names[j],
-			                     nm_ip_route_get_attribute (route, attr_names[j]));
-		}
-
-		attr_str = nm_utils_format_variant_attributes (hash, ' ', '=');
-
-		if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE) {
-			if (printable->len > 0)
-				g_string_append (printable, ", ");
-
-			g_string_append_printf (printable, "%s/%u",
-			                        nm_ip_route_get_dest (route),
-			                        nm_ip_route_get_prefix (route));
-
-			if (nm_ip_route_get_next_hop (route))
-				g_string_append_printf (printable, " %s", nm_ip_route_get_next_hop (route));
-			if (nm_ip_route_get_metric (route) != -1)
-				g_string_append_printf (printable, " %u", (guint32) nm_ip_route_get_metric (route));
-			if (attr_str)
-				g_string_append_printf (printable, " %s", attr_str);
-		} else {
-
-			if (printable->len > 0)
-				g_string_append (printable, "; ");
-
-			g_string_append (printable, "{ ");
-
-			g_string_append_printf (printable, "ip = %s/%u",
-			                        nm_ip_route_get_dest (route),
-			                        nm_ip_route_get_prefix (route));
-
-			if (nm_ip_route_get_next_hop (route)) {
-				g_string_append_printf (printable, ", nh = %s",
-				                        nm_ip_route_get_next_hop (route));
-			}
-
-			if (nm_ip_route_get_metric (route) != -1)
-				g_string_append_printf (printable, ", mt = %u", (guint32) nm_ip_route_get_metric (route));
-			if (attr_str)
-				g_string_append_printf (printable, " %s", attr_str);
-
-			g_string_append (printable, " }");
-		}
-	}
-
-	return g_string_free (printable, FALSE);
-}
-
-static char *
-_get_fcn_ip4_config_dad_timeout (ARGS_GET_FCN)
-{
-	NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting);
-	gint dad_timeout;
-
-	dad_timeout = nm_setting_ip_config_get_dad_timeout (s_ip);
-	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
-		return g_strdup_printf ("%d", dad_timeout);
-
-	switch (dad_timeout) {
-	case -1:
-		return g_strdup_printf (_("%d (default)"), dad_timeout);
-	case 0:
-		return g_strdup_printf (_("%d (off)"), dad_timeout);
-	default:
-		return g_strdup_printf ("%d", dad_timeout);
-	}
-}
-
-static const char *ipv4_valid_methods[] = {
-	NM_SETTING_IP4_CONFIG_METHOD_AUTO,
-	NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL,
-	NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
-	NM_SETTING_IP4_CONFIG_METHOD_SHARED,
-	NM_SETTING_IP4_CONFIG_METHOD_DISABLED,
-	NULL
-};
-
-static gboolean
-_set_fcn_ip4_config_method (ARGS_SET_FCN)
-{
-	/* Silently accept "static" and convert to "manual" */
-	if (value && strlen (value) > 1 && matches (value, "static"))
-		value = NM_SETTING_IP4_CONFIG_METHOD_MANUAL;
-
-	return check_and_set_string (setting, property_info->property_name, value, ipv4_valid_methods, error);
-}
-
-static gboolean
-_set_fcn_ip4_config_dns (ARGS_SET_FCN)
-{
-	char **strv = NULL, **iter, *addr;
-	guint32 ip4_addr;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (value, " \t,", 0);
-	for (iter = strv; iter && *iter; iter++) {
-		addr = g_strstrip (*iter);
-		if (inet_pton (AF_INET, addr, &ip4_addr) < 1) {
-			g_set_error (error, 1, 0, _("invalid IPv4 address '%s'"), addr);
-			g_strfreev (strv);
-			return FALSE;
-		}
-		nm_setting_ip_config_add_dns (NM_SETTING_IP_CONFIG (setting), addr);
-	}
-	g_strfreev (strv);
-	return TRUE;
-}
-
-static gboolean
-_validate_and_remove_ipv4_dns (NMSettingIPConfig *setting,
-                               const char *dns,
-                               GError **error)
-{
-	guint32 ip4_addr;
-	gboolean ret;
-
-	if (inet_pton (AF_INET, dns, &ip4_addr) < 1) {
-		g_set_error (error, 1, 0, _("invalid IPv4 address '%s'"), dns);
-		return FALSE;
-	}
-
-	ret = nm_setting_ip_config_remove_dns_by_value (setting, dns);
-	if (!ret)
-		g_set_error (error, 1, 0, _("the property doesn't contain DNS server '%s'"), dns);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_dns,
-                               NM_SETTING_IP_CONFIG,
-                               nm_setting_ip_config_get_num_dns,
-                               nm_setting_ip_config_remove_dns,
-                               _validate_and_remove_ipv4_dns)
-
-static gboolean
-_set_fcn_ip4_config_dns_search (ARGS_SET_FCN)
-{
-	char **strv = NULL;
-	guint i = 0;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (value, " \t,", 0);
-	if (!verify_string_list (strv, property_info->property_name, nmc_util_is_domain, error)) {
-		g_strfreev (strv);
-		return FALSE;
-	}
-
-	while (strv && strv[i])
-		nm_setting_ip_config_add_dns_search (NM_SETTING_IP_CONFIG (setting), strv[i++]);
-	g_strfreev (strv);
-
-	return TRUE;
-}
-
-static gboolean
-_validate_and_remove_ipv4_dns_search (NMSettingIPConfig *setting,
-                                      const char *dns_search,
-                                      GError **error)
-{
-	gboolean ret;
-
-	ret = nm_setting_ip_config_remove_dns_search_by_value (setting, dns_search);
-	if (!ret)
-		g_set_error (error, 1, 0,
-		             _("the property doesn't contain DNS search domain '%s'"),
-		             dns_search);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_dns_search,
-                               NM_SETTING_IP_CONFIG,
-                               nm_setting_ip_config_get_num_dns_searches,
-                               nm_setting_ip_config_remove_dns_search,
-                               _validate_and_remove_ipv4_dns_search)
-
-static gboolean
-_set_fcn_ip4_config_dns_options (ARGS_SET_FCN)
-{
-	char **strv = NULL;
-	guint i = 0;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	nm_setting_ip_config_clear_dns_options (NM_SETTING_IP_CONFIG (setting), TRUE);
-	strv = nmc_strsplit_set (value, " \t,", 0);
-	while (strv && strv[i])
-		nm_setting_ip_config_add_dns_option (NM_SETTING_IP_CONFIG (setting), strv[i++]);
-	g_strfreev (strv);
-
-	return TRUE;
-}
-
-static gboolean
-_validate_and_remove_ipv4_dns_option (NMSettingIPConfig *setting,
-                                      const char *dns_option,
-                                      GError **error)
-{
-	gboolean ret;
-
-	ret = nm_setting_ip_config_remove_dns_option_by_value (setting, dns_option);
-	if (!ret)
-		g_set_error (error, 1, 0,
-		             _("the property doesn't contain DNS option '%s'"),
-		             dns_option);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_dns_options,
-                               NM_SETTING_IP_CONFIG,
-                               nm_setting_ip_config_get_num_dns_options,
-                               nm_setting_ip_config_remove_dns_option,
-                               _validate_and_remove_ipv4_dns_option)
-
-static NMIPAddress *
-_parse_ipv4_address (const char *address, GError **error)
-{
-	return _parse_ip_address (AF_INET, address, error);
-}
-
-static gboolean
-_set_fcn_ip4_config_addresses (ARGS_SET_FCN)
-{
-	char **strv = NULL, **iter;
-	NMIPAddress *ip4addr;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (value, ",", 0);
-	for (iter = strv; iter && *iter; iter++) {
-		ip4addr = _parse_ipv4_address (*iter, error);
-		if (!ip4addr) {
-			g_strfreev (strv);
-			return FALSE;
-		}
-		nm_setting_ip_config_add_address (NM_SETTING_IP_CONFIG (setting), ip4addr);
-		nm_ip_address_unref (ip4addr);
-	}
-	g_strfreev (strv);
-	return TRUE;
-}
-
-static gboolean
-_validate_and_remove_ipv4_address (NMSettingIPConfig *setting,
-                                   const char *address,
-                                   GError **error)
-{
-	NMIPAddress *ip4addr;
-	gboolean ret;
-
-	ip4addr = _parse_ipv4_address (address, error);
-	if (!ip4addr)
-		return FALSE;
-
-	ret = nm_setting_ip_config_remove_address_by_value (setting, ip4addr);
-	if (!ret)
-		g_set_error (error, 1, 0,
-		             _("the property doesn't contain IP address '%s'"), address);
-	nm_ip_address_unref (ip4addr);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_addresses,
-                               NM_SETTING_IP_CONFIG,
-                               nm_setting_ip_config_get_num_addresses,
-                               nm_setting_ip_config_remove_address,
-                               _validate_and_remove_ipv4_address)
-
-static gboolean
-_set_fcn_ip4_config_gateway (ARGS_SET_FCN)
-{
-	NMIPAddress *ip4addr;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (strchr (value, '/')) {
-		g_set_error (error, 1, 0,
-	                     _("invalid gateway address '%s'"), value);
-		return FALSE;
-	}
-	ip4addr = _parse_ipv4_address (value, error);
-	if (!ip4addr)
-		return FALSE;
-
-	g_object_set (setting, property_info->property_name, value, NULL);
-	nm_ip_address_unref (ip4addr);
-	return TRUE;
-}
-
-static NMIPRoute *
-_parse_ipv4_route (const char *route, GError **error)
-{
-	return nmc_parse_and_build_route (AF_INET, route, error);
-}
-
-static gboolean
-_set_fcn_ip4_config_routes (ARGS_SET_FCN)
-{
-	char **strv = NULL, **iter;
-	NMIPRoute *ip4route;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (value, ",", 0);
-	for (iter = strv; iter && *iter; iter++) {
-		ip4route = _parse_ipv4_route (*iter, error);
-		if (!ip4route) {
-			g_strfreev (strv);
-			return FALSE;
-		}
-		nm_setting_ip_config_add_route (NM_SETTING_IP_CONFIG (setting), ip4route);
-		nm_ip_route_unref (ip4route);
-	}
-	g_strfreev (strv);
-	return TRUE;
-}
-
-static gboolean
-_validate_and_remove_ipv4_route (NMSettingIPConfig *setting,
-                                 const char *route,
-                                 GError **error)
-{
-	NMIPRoute *ip4route;
-	gboolean ret;
-
-	ip4route = _parse_ipv4_route (route, error);
-	if (!ip4route)
-		return FALSE;
-
-	ret = nm_setting_ip_config_remove_route_by_value (setting, ip4route);
-	if (!ret)
-		g_set_error (error, 1, 0, _("the property doesn't contain route '%s'"), route);
-	nm_ip_route_unref (ip4route);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_routes,
-                               NM_SETTING_IP_CONFIG,
-                               nm_setting_ip_config_get_num_routes,
-                               nm_setting_ip_config_remove_route,
-                               _validate_and_remove_ipv4_route)
-
-static char *
-_get_fcn_ip6_config_ip6_privacy (ARGS_GET_FCN)
-{
-	NMSettingIP6Config *s_ip6 = NM_SETTING_IP6_CONFIG (setting);
-	return ip6_privacy_to_string (nm_setting_ip6_config_get_ip6_privacy (s_ip6), get_type);
-}
-
-static const char *ipv6_valid_methods[] = {
-	NM_SETTING_IP6_CONFIG_METHOD_IGNORE,
-	NM_SETTING_IP6_CONFIG_METHOD_AUTO,
-	NM_SETTING_IP6_CONFIG_METHOD_DHCP,
-	NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL,
-	NM_SETTING_IP6_CONFIG_METHOD_MANUAL,
-	NM_SETTING_IP6_CONFIG_METHOD_SHARED,
-	NULL
-};
-
-static gboolean
-_set_fcn_ip6_config_method (ARGS_SET_FCN)
-{
-	/* Silently accept "static" and convert to "manual" */
-	if (value && strlen (value) > 1 && matches (value, "static"))
-		value = NM_SETTING_IP6_CONFIG_METHOD_MANUAL;
-
-	return check_and_set_string (setting, property_info->property_name, value, ipv6_valid_methods, error);
-}
-
-static gboolean
-_set_fcn_ip6_config_dns (ARGS_SET_FCN)
-{
-	char **strv = NULL, **iter, *addr;
-	struct in6_addr ip6_addr;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (value, " \t,", 0);
-	for (iter = strv; iter && *iter; iter++) {
-		addr = g_strstrip (*iter);
-		if (inet_pton (AF_INET6, addr, &ip6_addr) < 1) {
-			g_set_error (error, 1, 0, _("invalid IPv6 address '%s'"), addr);
-			g_strfreev (strv);
-			return FALSE;
-		}
-		nm_setting_ip_config_add_dns (NM_SETTING_IP_CONFIG (setting), addr);
-	}
-	g_strfreev (strv);
-	return TRUE;
-}
-
-static gboolean
-_validate_and_remove_ipv6_dns (NMSettingIPConfig *setting,
-                               const char *dns,
-                               GError **error)
-{
-	struct in6_addr ip6_addr;
-	gboolean ret;
-
-	if (inet_pton (AF_INET6, dns, &ip6_addr) < 1) {
-		g_set_error (error, 1, 0, _("invalid IPv6 address '%s'"), dns);
-		return FALSE;
-	}
-
-	ret = nm_setting_ip_config_remove_dns_by_value (setting, dns);
-	if (!ret)
-		g_set_error (error, 1, 0, _("the property doesn't contain DNS server '%s'"), dns);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_dns,
-                               NM_SETTING_IP_CONFIG,
-                               nm_setting_ip_config_get_num_dns,
-                               nm_setting_ip_config_remove_dns,
-                               _validate_and_remove_ipv6_dns)
-
-static gboolean
-_set_fcn_ip6_config_dns_search (ARGS_SET_FCN)
-{
-	char **strv = NULL;
-	guint i = 0;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (value, " \t,", 0);
-	if (!verify_string_list (strv, property_info->property_name, nmc_util_is_domain, error)) {
-		g_strfreev (strv);
-		return FALSE;
-	}
-
-	while (strv && strv[i])
-		nm_setting_ip_config_add_dns_search (NM_SETTING_IP_CONFIG (setting), strv[i++]);
-	g_strfreev (strv);
-
-	return TRUE;
-}
-
-static gboolean
-_validate_and_remove_ipv6_dns_search (NMSettingIPConfig *setting,
-                                      const char *dns_search,
-                                      GError **error)
-{
-	gboolean ret;
-
-	ret = nm_setting_ip_config_remove_dns_search_by_value (setting, dns_search);
-	if (!ret)
-		g_set_error (error, 1, 0,
-		             _("the property doesn't contain DNS search domain '%s'"),
-		             dns_search);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_dns_search,
-                               NM_SETTING_IP_CONFIG,
-                               nm_setting_ip_config_get_num_dns_searches,
-                               nm_setting_ip_config_remove_dns_search,
-                               _validate_and_remove_ipv6_dns_search)
-
-static gboolean
-_set_fcn_ip6_config_dns_options (ARGS_SET_FCN)
-{
-	char **strv = NULL;
-	guint i = 0;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	nm_setting_ip_config_clear_dns_options (NM_SETTING_IP_CONFIG (setting), TRUE);
-	strv = nmc_strsplit_set (value, " \t,", 0);
-	while (strv && strv[i])
-		nm_setting_ip_config_add_dns_option (NM_SETTING_IP_CONFIG (setting), strv[i++]);
-	g_strfreev (strv);
-
-	return TRUE;
-}
-
-static gboolean
-_validate_and_remove_ipv6_dns_option (NMSettingIPConfig *setting,
-                                      const char *dns_option,
-                                      GError **error)
-{
-	gboolean ret;
-
-	ret = nm_setting_ip_config_remove_dns_option_by_value (setting, dns_option);
-	if (!ret)
-		g_set_error (error, 1, 0,
-		             _("the property doesn't contain DNS option '%s'"),
-		             dns_option);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_dns_options,
-                               NM_SETTING_IP_CONFIG,
-                               nm_setting_ip_config_get_num_dns_options,
-                               nm_setting_ip_config_remove_dns_option,
-                               _validate_and_remove_ipv6_dns_option)
-
-static NMIPAddress *
-_parse_ipv6_address (const char *address, GError **error)
-{
-	return _parse_ip_address (AF_INET6, address, error);
-}
-
-static gboolean
-_set_fcn_ip6_config_addresses (ARGS_SET_FCN)
-{
-	char **strv = NULL, **iter;
-	NMIPAddress *ip6addr;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (value, ",", 0);
-	for (iter = strv; iter && *iter; iter++) {
-		ip6addr = _parse_ipv6_address (*iter, error);
-		if (!ip6addr) {
-			g_strfreev (strv);
-			return FALSE;
-		}
-		nm_setting_ip_config_add_address (NM_SETTING_IP_CONFIG (setting), ip6addr);
-		nm_ip_address_unref (ip6addr);
-	}
-	g_strfreev (strv);
-	return TRUE;
-}
-
-static gboolean
-_validate_and_remove_ipv6_address (NMSettingIPConfig *setting,
-                                   const char *address,
-                                   GError **error)
-{
-	NMIPAddress *ip6addr;
-	gboolean ret;
-
-	ip6addr = _parse_ipv6_address (address, error);
-	if (!ip6addr)
-		return FALSE;
-
-	ret = nm_setting_ip_config_remove_address_by_value (setting, ip6addr);
-	if (!ret)
-		g_set_error (error, 1, 0, _("the property doesn't contain IP address '%s'"), address);
-	nm_ip_address_unref (ip6addr);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_addresses,
-                               NM_SETTING_IP_CONFIG,
-                               nm_setting_ip_config_get_num_addresses,
-                               nm_setting_ip_config_remove_address,
-                               _validate_and_remove_ipv6_address)
-
-static gboolean
-_set_fcn_ip6_config_gateway (ARGS_SET_FCN)
-{
-	NMIPAddress *ip6addr;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (strchr (value, '/')) {
-		g_set_error (error, 1, 0,
-	                     _("invalid gateway address '%s'"), value);
-		return FALSE;
-	}
-	ip6addr = _parse_ipv6_address (value, error);
-	if (!ip6addr)
-		return FALSE;
-
-	g_object_set (setting, property_info->property_name, value, NULL);
-	nm_ip_address_unref (ip6addr);
-	return TRUE;
-}
-
-static NMIPRoute *
-_parse_ipv6_route (const char *route, GError **error)
-{
-	return nmc_parse_and_build_route (AF_INET6, route, error);
-}
-
-static gboolean
-_set_fcn_ip6_config_routes (ARGS_SET_FCN)
-{
-	char **strv = NULL, **iter;
-	NMIPRoute *ip6route;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (value, ",", 0);
-	for (iter = strv; iter && *iter; iter++) {
-		ip6route = _parse_ipv6_route (*iter, error);
-		if (!ip6route) {
-			g_strfreev (strv);
-			return FALSE;
-		}
-		nm_setting_ip_config_add_route (NM_SETTING_IP_CONFIG (setting), ip6route);
-		nm_ip_route_unref (ip6route);
-	}
-	g_strfreev (strv);
-	return TRUE;
-}
-
-static gboolean
-_validate_and_remove_ipv6_route (NMSettingIPConfig *setting,
-                                 const char *route,
-                                 GError **error)
-{
-	NMIPRoute *ip6route;
-	gboolean ret;
-
-	ip6route = _parse_ipv6_route (route, error);
-	if (!ip6route)
-		return FALSE;
-
-	ret = nm_setting_ip_config_remove_route_by_value (setting, ip6route);
-	if (!ret)
-		g_set_error (error, 1, 0, _("the property doesn't contain route '%s'"), route);
-	nm_ip_route_unref (ip6route);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_routes,
-                               NM_SETTING_IP_CONFIG,
-                               nm_setting_ip_config_get_num_routes,
-                               nm_setting_ip_config_remove_route,
-                               _validate_and_remove_ipv6_route)
-
-static gboolean
-_set_fcn_ip6_config_ip6_privacy (ARGS_SET_FCN)
-{
-	unsigned long val_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_uint (value, FALSE, 0, 0, &val_int)) {
-		g_set_error (error, 1, 0, _("'%s' is not a number"), value);
-		return FALSE;
-	}
-
-	if (   val_int != NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED
-	    && val_int != NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR
-	    && val_int != NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR) {
-		g_set_error (error, 1, 0, _("'%s' is not valid; use 0, 1, or 2"), value);
-		return FALSE;
-	}
-
-	g_object_set (setting, property_info->property_name, val_int, NULL);
-	return TRUE;
-}
-
-static char *
-_get_fcn_ip6_config_addr_gen_mode (ARGS_GET_FCN)
-{
-	NMSettingIP6Config *s_ip6 = NM_SETTING_IP6_CONFIG (setting);
-	NMSettingIP6ConfigAddrGenMode addr_gen_mode;
-
-	addr_gen_mode = nm_setting_ip6_config_get_addr_gen_mode (s_ip6);
-	return nm_utils_enum_to_str (nm_setting_ip6_config_addr_gen_mode_get_type (), addr_gen_mode);
-}
-
-
-static gboolean
-_set_fcn_ip6_config_addr_gen_mode (ARGS_SET_FCN)
-{
-	NMSettingIP6ConfigAddrGenMode addr_gen_mode;
-
-	if (!nm_utils_enum_from_str (nm_setting_ip6_config_addr_gen_mode_get_type (), value,
-	                             (int *) &addr_gen_mode, NULL)) {
-		g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
-		             value, "eui64,stable-privacy");
-			return FALSE;
-	}
-
-	g_object_set (setting, property_info->property_name, addr_gen_mode, NULL);
-	return TRUE;
-}
-
-static char *
-_get_fcn_macsec_mode (ARGS_GET_FCN)
-{
-	NMSettingMacsec *s_macsec = NM_SETTING_MACSEC (setting);
-	NMSettingMacsecMode mode;
-
-	mode = nm_setting_macsec_get_mode (s_macsec);
-	return nm_utils_enum_to_str (nm_setting_macsec_mode_get_type (), mode);
-}
-
-static gboolean
-_set_fcn_macsec_mode (ARGS_SET_FCN)
-{
-	NMSettingMacsecMode mode;
-	gs_free char *options = NULL;
-
-	if (!nm_utils_enum_from_str (nm_setting_macsec_mode_get_type (), value,
-	                             (int *) &mode, NULL)) {
-		options = g_strjoinv (",",
-		                      (char **) nm_utils_enum_get_values (nm_setting_macsec_mode_get_type (),
-		                                                          G_MININT,
-		                                                          G_MAXINT));
-		g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
-		             value, options);
-			return FALSE;
-	}
-
-	g_object_set (setting, property_info->property_name, mode, NULL);
-	return TRUE;
-}
-
-static char *
-_get_fcn_macsec_validation (ARGS_GET_FCN)
-{
-	NMSettingMacsec *s_macsec = NM_SETTING_MACSEC (setting);
-	NMSettingMacsecValidation validation;
-
-	validation = nm_setting_macsec_get_validation (s_macsec);
-	return nm_utils_enum_to_str (nm_setting_macsec_validation_get_type (), validation);
-}
-
-static gboolean
-_set_fcn_macsec_validation (ARGS_SET_FCN)
-{
-	NMSettingMacsecMode validation;
-	gs_free char *options = NULL;
-
-	if (!nm_utils_enum_from_str (nm_setting_macsec_validation_get_type (), value,
-	                             (int *) &validation, NULL)) {
-		options = g_strjoinv (",",
-		                      (char **) nm_utils_enum_get_values (nm_setting_macsec_validation_get_type (),
-		                                                          G_MININT,
-		                                                          G_MAXINT));
-		g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
-		             value, options);
-			return FALSE;
-	}
-
-	g_object_set (setting, property_info->property_name, validation, NULL);
-	return TRUE;
-}
-
-static char *
-_get_fcn_macvlan_mode (ARGS_GET_FCN)
-{
-	NMSettingMacvlan *s_macvlan = NM_SETTING_MACVLAN (setting);
-	NMSettingMacvlanMode mode;
-	char *tmp, *str;
-
-	mode = nm_setting_macvlan_get_mode (s_macvlan);
-	tmp = nm_utils_enum_to_str (nm_setting_macvlan_mode_get_type (), mode);
-
-	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
-		str = g_strdup (tmp ? tmp : "");
-	else
-		str = g_strdup_printf ("%d (%s)", mode, tmp ? tmp : "");
-	g_free (tmp);
-
-	return str;
-}
-
-static gboolean
-_set_fcn_macvlan_mode (ARGS_SET_FCN)
-{
-	NMSettingMacvlanMode mode;
-	gs_free const char **options = NULL;
-	gs_free char *options_str = NULL;
-	long int t;
-	gboolean ret;
-
-	if (nmc_string_to_int_base (value, 0, TRUE, 0, _NM_SETTING_MACVLAN_MODE_NUM - 1, &t))
-		mode = (NMSettingMacvlanMode) t;
-	else {
-		ret = nm_utils_enum_from_str (nm_setting_macvlan_mode_get_type (), value,
-		                              (int *) &mode, NULL);
-
-		if (!ret) {
-				options = nm_utils_enum_get_values (nm_setting_macvlan_mode_get_type(),
-				                                    NM_SETTING_MACVLAN_MODE_UNKNOWN + 1,
-				                                    G_MAXINT);
-				options_str = g_strjoinv (",", (char **) options);
-				g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
-				             value, options_str);
-				return FALSE;
-			}
-		}
-
-	g_object_set (setting, property_info->property_name, (guint) mode, NULL);
-	return TRUE;
-}
-
-static char *
-_get_fcn_olpc_mesh_ssid (ARGS_GET_FCN)
-{
-	NMSettingOlpcMesh *s_olpc_mesh = NM_SETTING_OLPC_MESH (setting);
-	GBytes *ssid;
-	char *ssid_str = NULL;
-
-	ssid = nm_setting_olpc_mesh_get_ssid (s_olpc_mesh);
-	if (ssid) {
-		ssid_str = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL),
-		                                  g_bytes_get_size (ssid));
-	}
-
-	return ssid_str;
-}
-
-static gboolean
-_set_fcn_olpc_mesh_channel (ARGS_SET_FCN)
-{
-	unsigned long chan_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_uint (value, TRUE, 1, 13, &chan_int)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid channel; use <1-13>"), value);
-		return FALSE;
-	}
-	g_object_set (setting, property_info->property_name, chan_int, NULL);
-	return TRUE;
-}
-
-static char *
-_get_fcn_proxy_method (ARGS_GET_FCN)
-{
-	NMSettingProxy *s_proxy = NM_SETTING_PROXY (setting);
-	NMSettingProxyMethod method;
-
-	method = nm_setting_proxy_get_method (s_proxy);
-	return nm_utils_enum_to_str (nm_setting_proxy_method_get_type (), method);
-}
-
-static gboolean
-_set_fcn_proxy_method (ARGS_SET_FCN)
-{
-	int method;
-	gboolean ret;
-
-	ret = nm_utils_enum_from_str (nm_setting_proxy_method_get_type(), value,
-	                              &method, NULL);
-
-	if (!ret) {
-		gs_free const char **values = NULL;
-		gs_free char *values_str = NULL;
-
-		values = nm_utils_enum_get_values (nm_setting_proxy_method_get_type (),
-		                                   NM_SETTING_PROXY_METHOD_NONE,
-		                                   G_MAXINT);
-		values_str = g_strjoinv (",", (char **) values);
-		g_set_error (error, 1, 0, _("invalid method '%s', use one of %s"),
-		             value, values_str);
-
-		return FALSE;
-	}
-
-	g_object_set (setting, property_info->property_name, method, NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_proxy_pac_script (ARGS_SET_FCN)
-{
-	char *script = NULL;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_proxy_check_script (value, &script, error)) {
-		return FALSE;
-	}
-	g_object_set (setting, property_info->property_name, script, NULL);
-	g_free (script);
-	return TRUE;
-}
-
-static char *
-_get_fcn_serial_parity (ARGS_GET_FCN)
-{
-	NMSettingSerial *s_serial = NM_SETTING_SERIAL (setting);
-
-	switch (nm_setting_serial_get_parity (s_serial)) {
-	case NM_SETTING_SERIAL_PARITY_EVEN:
-		return g_strdup ("even");
-	case NM_SETTING_SERIAL_PARITY_ODD:
-		return g_strdup ("odd");
-	default:
-	case NM_SETTING_SERIAL_PARITY_NONE:
-		return g_strdup ("none");
-	}
-}
-
-static gboolean
-_set_fcn_serial_parity (ARGS_SET_FCN)
-{
-	NMSettingSerialParity parity;
-
-	if (value[0] == 'E' || value[0] == 'e')
-		parity = NM_SETTING_SERIAL_PARITY_EVEN;
-	else if (value[0] == 'O' || value[0] == 'o')
-		parity = NM_SETTING_SERIAL_PARITY_ODD;
-	else if (value[0] == 'N' || value[0] == 'n')
-		parity = NM_SETTING_SERIAL_PARITY_NONE;
-	else {
-		g_set_error (error, 1, 0, _("'%s' is not valid; use [e, o, n]"), value);
-		return FALSE;
-	}
-
-	g_object_set (setting, property_info->property_name, parity, NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_team_config (ARGS_SET_FCN)
-{
-	char *json = NULL;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_team_check_config (value, &json, error)) {
-		return FALSE;
-	}
-	g_object_set (setting, property_info->property_name, json, NULL);
-	g_free (json);
-	return TRUE;
-}
-
-static char *
-_get_fcn_tun_mode (ARGS_GET_FCN)
-{
-	NMSettingTun *s_tun = NM_SETTING_TUN (setting);
-	NMSettingTunMode mode;
-	char *tmp, *str;
-
-	mode = nm_setting_tun_get_mode (s_tun);
-	tmp = nm_utils_enum_to_str (nm_setting_tun_mode_get_type (), mode);
-	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
-		str = g_strdup_printf ("%s", tmp ? tmp : "");
-	else
-		str = g_strdup_printf ("%d (%s)", mode, tmp ? tmp : "");
-	g_free (tmp);
-	return str;
-}
-
-static gboolean
-_set_fcn_tun_mode (ARGS_SET_FCN)
-{
-	NMSettingTunMode mode;
-	gboolean ret;
-	long int t;
-
-	if (nmc_string_to_int_base (value, 0, TRUE, 0, NM_SETTING_TUN_MODE_TAP, &t))
-		mode = (NMSettingTunMode) t;
-	else {
-		ret = nm_utils_enum_from_str (nm_setting_tun_mode_get_type (), value,
-		                              (int *) &mode, NULL);
-
-		if (!ret) {
-			g_set_error (error, 1, 0, _("invalid option '%s', use '%s' or '%s'"),
-			             value, "tun", "tap");
-			return FALSE;
-		}
-	}
-
-	g_object_set (setting, property_info->property_name, (guint) mode, NULL);
-	return TRUE;
-}
-
-static char *
-_get_fcn_vlan_flags (ARGS_GET_FCN)
-{
-	NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting);
-	return vlan_flags_to_string (nm_setting_vlan_get_flags (s_vlan), get_type);
-}
-
-static char *
-_get_fcn_vlan_ingress_priority_map (ARGS_GET_FCN)
-{
-	NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting);
-	return vlan_priorities_to_string (s_vlan, NM_VLAN_INGRESS_MAP);
-}
-
-static char *
-_get_fcn_vlan_egress_priority_map (ARGS_GET_FCN)
-{
-	NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting);
-	return vlan_priorities_to_string (s_vlan, NM_VLAN_EGRESS_MAP);
-}
-
-static gboolean
-_set_vlan_xgress_priority_map (NMSetting *setting,
-                               const char *value,
-                               NMVlanPriorityMap map_type,
-                               GError **error)
-{
-	char **prio_map, **p;
-
-	prio_map = nmc_vlan_parse_priority_maps (value, map_type, error);
-	if (!prio_map)
-		return FALSE;
-
-	for (p = prio_map; p && *p; p++)
-		nm_setting_vlan_add_priority_str (NM_SETTING_VLAN (setting), map_type, *p);
-
-	g_strfreev (prio_map);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_vlan_ingress_priority_map (ARGS_SET_FCN)
-{
-	return _set_vlan_xgress_priority_map (setting, value, NM_VLAN_INGRESS_MAP, error);
-}
-
-static gboolean
-_set_fcn_vlan_egress_priority_map (ARGS_SET_FCN)
-{
-	return _set_vlan_xgress_priority_map (setting, value, NM_VLAN_EGRESS_MAP, error);
-}
-
-static gboolean
-_remove_vlan_xgress_priority_map (NMSetting *setting,
-                                  const NMMetaPropertyInfo *property_info,
-                                  const char *value,
-                                  guint32 idx,
-                                  NMVlanPriorityMap map_type,
-                                  GError **error)
-{
-	guint32 num;
-
-	/* If value != NULL, remove by value */
-	if (value) {
-		gboolean ret;
-		char **prio_map;
-		gs_free char *v = g_strdup (value);
-
-		prio_map = nmc_vlan_parse_priority_maps (v, map_type, error);
-		if (!prio_map)
-			return FALSE;
-		if (prio_map[1])
-			g_print (_("Warning: only one mapping at a time is supported; taking the first one (%s)\n"),
-			         prio_map[0]);
-		ret = nm_setting_vlan_remove_priority_str_by_value (NM_SETTING_VLAN (setting),
-		                                                    map_type,
-		                                                    prio_map[0]);
-
-		if (!ret)
-			g_set_error (error, 1, 0, _("the property doesn't contain mapping '%s'"), prio_map[0]);
-		g_strfreev (prio_map);
-		return ret;
-	}
-
-	/* Else remove by index */
-	num = nm_setting_vlan_get_num_priorities (NM_SETTING_VLAN (setting), map_type);
-	if (num == 0) {
-		g_set_error_literal (error, 1, 0, _("no priority to remove"));
-		return FALSE;
-	}
-	if (idx >= num) {
-		g_set_error (error, 1, 0, _("index '%d' is not in the range of <0-%d>"),
-		             idx, num - 1);
-		return FALSE;
-	}
-
-	nm_setting_vlan_remove_priority (NM_SETTING_VLAN (setting), map_type, idx);
-	return TRUE;
-}
-
-static gboolean
-_remove_fcn_vlan_ingress_priority_map (ARGS_REMOVE_FCN)
-{
-	return _remove_vlan_xgress_priority_map (setting,
-	                                         property_info,
-	                                         value,
-	                                         idx,
-	                                         NM_VLAN_INGRESS_MAP,
-	                                         error);
-}
-
-static gboolean
-_remove_fcn_vlan_egress_priority_map (ARGS_REMOVE_FCN)
-{
-	return _remove_vlan_xgress_priority_map (setting,
-	                                         property_info,
-	                                         value,
-	                                         idx,
-	                                         NM_VLAN_EGRESS_MAP,
-	                                         error);
-}
-
-static char *
-_get_fcn_vpn_data (ARGS_GET_FCN)
-{
-	NMSettingVpn *s_vpn = NM_SETTING_VPN (setting);
-	GString *data_item_str;
-
-	data_item_str = g_string_new (NULL);
-	nm_setting_vpn_foreach_data_item (s_vpn, &vpn_data_item, data_item_str);
-
-	return g_string_free (data_item_str, FALSE);
-}
-
-static char *
-_get_fcn_vpn_secrets (ARGS_GET_FCN)
-{
-	NMSettingVpn *s_vpn = NM_SETTING_VPN (setting);
-	GString *secret_str;
-
-	secret_str = g_string_new (NULL);
-	nm_setting_vpn_foreach_secret (s_vpn, &vpn_data_item, secret_str);
-
-	return g_string_free (secret_str, FALSE);
-}
-
-static const char *
-_validate_vpn_hash_value (const char *option, const char *value, GError **error)
-{
-	/* nm_setting_vpn_add_data_item() and nm_setting_vpn_add_secret() does not
-	 * allow empty strings */
-	if (!value || !*value) {
-		g_set_error (error, 1, 0, _("'%s' cannot be empty"), option);
-		return NULL;
-	}
-	return value;
-}
-
-DEFINE_SETTER_OPTIONS (_set_fcn_vpn_data,
-                       NM_SETTING_VPN,
-                       NMSettingVpn,
-                       nm_setting_vpn_add_data_item,
-                       NULL,
-                       _validate_vpn_hash_value)
-DEFINE_REMOVER_OPTION (_remove_fcn_vpn_data,
-                       NM_SETTING_VPN,
-                       nm_setting_vpn_remove_data_item)
-
-DEFINE_SETTER_OPTIONS (_set_fcn_vpn_secrets,
-                       NM_SETTING_VPN,
-                       NMSettingVpn,
-                       nm_setting_vpn_add_secret,
-                       NULL,
-                       _validate_vpn_hash_value)
-DEFINE_REMOVER_OPTION (_remove_fcn_vpn_secrets,
-                       NM_SETTING_VPN,
-                       nm_setting_vpn_remove_secret)
-
-static char *
-_get_fcn_wired_wake_on_lan (ARGS_GET_FCN)
-{
-	NMSettingWired *s_wired = NM_SETTING_WIRED (setting);
-	NMSettingWiredWakeOnLan wol;
-	char *tmp, *str;
-
-	wol = nm_setting_wired_get_wake_on_lan (s_wired);
-	tmp = nm_utils_enum_to_str (nm_setting_wired_wake_on_lan_get_type (), wol);
-	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
-		str = g_strdup_printf ("%s", tmp && *tmp ? tmp : "none");
-	else
-		str = g_strdup_printf ("%d (%s)", wol, tmp && *tmp ? tmp : "none");
-	g_free (tmp);
-	return str;
-}
-
-static gboolean
-_set_fcn_wired_wake_on_lan (ARGS_SET_FCN)
-{
-	NMSettingWiredWakeOnLan wol;
-	gs_free char *err_token = NULL;
-	gboolean ret;
-	long int t;
-
-	if (nmc_string_to_int_base (value, 0, TRUE, 0,
-	                            NM_SETTING_WIRED_WAKE_ON_LAN_ALL
-	                            | NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS,
-	                            &t))
-		wol = (NMSettingWiredWakeOnLan) t;
-	else {
-		ret = nm_utils_enum_from_str (nm_setting_wired_wake_on_lan_get_type (), value,
-		                              (int *) &wol, &err_token);
-
-		if (!ret) {
-			if (   g_ascii_strcasecmp (err_token, "none") == 0
-			    || g_ascii_strcasecmp (err_token, "disable") == 0
-			    || g_ascii_strcasecmp (err_token, "disabled") == 0)
-				wol = NM_SETTING_WIRED_WAKE_ON_LAN_NONE;
-			else {
-				g_set_error (error, 1, 0, _("invalid option '%s', use a combination of [%s] or 'ignore', 'default' or 'none'"),
-				             err_token,
-				             nm_utils_enum_to_str (nm_setting_wired_wake_on_lan_get_type (),
-				                                   NM_SETTING_WIRED_WAKE_ON_LAN_ALL));
-				return FALSE;
-			}
-		}
-	}
-
-	if (   NM_FLAGS_ANY (wol, NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS)
-	    && !nm_utils_is_power_of_two (wol)) {
-		g_set_error_literal (error, 1, 0, _("'default' and 'ignore' are incompatible with other flags"));
-		return FALSE;
-	}
-
-	g_object_set (setting, property_info->property_name, (guint) wol, NULL);
-	return TRUE;
-}
-
-DEFINE_SETTER_MAC_BLACKLIST (_set_fcn_wired_mac_address_blacklist,
-                             NM_SETTING_WIRED,
-                             nm_setting_wired_add_mac_blacklist_item)
-
-static gboolean
-_validate_and_remove_wired_mac_blacklist_item (NMSettingWired *setting,
-                                              const char *mac,
-                                              GError **error)
-{
-	gboolean ret;
-	guint8 buf[32];
-
-	if (!nm_utils_hwaddr_aton (mac, buf, ETH_ALEN)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid MAC address"), mac);
-                return FALSE;
-	}
-
-	ret = nm_setting_wired_remove_mac_blacklist_item_by_value (setting, mac);
-	if (!ret)
-		g_set_error (error, 1, 0, _("the property doesn't contain MAC address '%s'"), mac);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_wired_mac_address_blacklist,
-                               NM_SETTING_WIRED,
-                               nm_setting_wired_get_num_mac_blacklist_items,
-                               nm_setting_wired_remove_mac_blacklist_item,
-                               _validate_and_remove_wired_mac_blacklist_item)
-
-static gboolean
-_set_fcn_wired_s390_subchannels (ARGS_SET_FCN)
-{
-	char **strv = NULL;
-	int len;
-
-	strv = nmc_strsplit_set (value, " ,\t", 0);
-	len = g_strv_length (strv);
-	if (len != 2 && len != 3) {
-		g_set_error (error, 1, 0, _("'%s' is not valid; 2 or 3 strings should be provided"),
-		             value);
-		g_strfreev (strv);
-		return FALSE;
-	}
-
-	g_object_set (setting, property_info->property_name, strv, NULL);
-	g_strfreev (strv);
-	return TRUE;
-}
-
-static const char *
-_validate_s390_option_value (const char *option, const char *value, GError **error)
-{
-	/*  nm_setting_wired_add_s390_option() requires value len in <1,199> interval */
-	if (!value || !*value || strlen (value) >= 200) {
-		g_set_error (error, 1, 0, _("'%s' string value should consist of 1 - 199 characters"), option);
-		return NULL;
-	}
-	return value;
-}
-DEFINE_SETTER_OPTIONS (_set_fcn_wired_s390_options,
-                       NM_SETTING_WIRED,
-                       NMSettingWired,
-                       nm_setting_wired_add_s390_option,
-                       nm_setting_wired_get_valid_s390_options,
-                       _validate_s390_option_value)
-DEFINE_REMOVER_OPTION (_remove_fcn_wired_s390_options,
-                       NM_SETTING_WIRED,
-                       nm_setting_wired_remove_s390_option)
-
-static const char *const*
-_values_fcn__wired_s390_options (ARGS_VALUES_FCN)
-{
-	return nm_setting_wired_get_valid_s390_options (NULL);
-}
-
-static const char *
-_describe_fcn_wired_s390_options (ARGS_DESCRIBE_FCN)
-{
-	gs_free char *options_str = NULL;
-	const char **valid_options;
-	char *s;
-
-	valid_options = nm_setting_wired_get_valid_s390_options (NULL);
-
-	options_str = g_strjoinv (", ", (char **) valid_options);
-
-	s = g_strdup_printf (_("Enter a list of S/390 options formatted as:\n"
-	                       "  option = <value>, option = <value>,...\n"
-	                       "Valid options are: %s\n"),
-	                       options_str);
-	return (*out_to_free = s);
-}
-
-
-static char *
-_get_fcn_wireless_ssid (ARGS_GET_FCN)
-{
-	NMSettingWireless *s_wireless = NM_SETTING_WIRELESS (setting);
-	GBytes *ssid;
-	char *ssid_str = NULL;
-
-	ssid = nm_setting_wireless_get_ssid (s_wireless);
-	if (ssid) {
-		ssid_str = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL),
-		                                  g_bytes_get_size (ssid));
-	}
-
-	return ssid_str;
-}
-
-static char *
-_get_fcn_wireless_powersave (ARGS_GET_FCN)
-{
-	NMSettingWireless *s_wireless = NM_SETTING_WIRELESS (setting);
-	NMSettingWirelessPowersave powersave;
-	gs_free char *str = NULL;
-	char *ret;
-
-	powersave = nm_setting_wireless_get_powersave (s_wireless);
-	str = nm_utils_enum_to_str (nm_setting_wireless_powersave_get_type (), powersave);
-
-	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE) {
-		ret = str;
-		str = NULL;
-		return ret;
-	} else
-		return g_strdup_printf ("%s (%u)", str, powersave);
-}
-
-static char *
-_get_fcn_wireless_mac_address_randomization (ARGS_GET_FCN)
-{
-	NMSettingWireless *s_wifi = NM_SETTING_WIRELESS (setting);
-	NMSettingMacRandomization randomization = nm_setting_wireless_get_mac_address_randomization (s_wifi);
-
-	if (randomization == NM_SETTING_MAC_RANDOMIZATION_DEFAULT)
-		return g_strdup (_("default"));
-	else if (randomization == NM_SETTING_MAC_RANDOMIZATION_NEVER)
-		return g_strdup (_("never"));
-	else if (randomization == NM_SETTING_MAC_RANDOMIZATION_ALWAYS)
-		return g_strdup_printf (_("always"));
-	else
-		return g_strdup_printf (_("unknown"));
-}
-
-static gboolean
-_set_fcn_wireless_channel (ARGS_SET_FCN)
-{
-	unsigned long chan_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_uint (value, FALSE, 0, 0, &chan_int)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid channel"), value);
-		return FALSE;
-	}
-
-	if (   !nm_utils_wifi_is_channel_valid (chan_int, "a")
-	    && !nm_utils_wifi_is_channel_valid (chan_int, "bg")) {
-		g_set_error (error, 1, 0, _("'%ld' is not a valid channel"), chan_int);
-		return FALSE;
-	}
-
-	g_object_set (setting, property_info->property_name, chan_int, NULL);
-	return TRUE;
-}
-
-DEFINE_SETTER_MAC_BLACKLIST (_set_fcn_wireless_mac_address_blacklist,
-                             NM_SETTING_WIRELESS,
-                             nm_setting_wireless_add_mac_blacklist_item)
-
-static gboolean
-_validate_and_remove_wifi_mac_blacklist_item (NMSettingWireless *setting,
-                                              const char *mac,
-                                              GError **error)
-{
-	gboolean ret;
-	guint8 buf[32];
-
-	if (!nm_utils_hwaddr_aton (mac, buf, ETH_ALEN)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid MAC address"), mac);
-                return FALSE;
-	}
-
-	ret = nm_setting_wireless_remove_mac_blacklist_item_by_value (setting, mac);
-	if (!ret)
-		g_set_error (error, 1, 0, _("the property doesn't contain MAC address '%s'"), mac);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_wireless_mac_address_blacklist,
-                               NM_SETTING_WIRELESS,
-                               nm_setting_wireless_get_num_mac_blacklist_items,
-                               nm_setting_wireless_remove_mac_blacklist_item,
-                               _validate_and_remove_wifi_mac_blacklist_item)
-
-static gboolean
-_set_fcn_wireless_powersave (ARGS_SET_FCN)
-{
-	NMSettingWirelessPowersave powersave;
-	gs_free const char **options = NULL;
-	gs_free char *options_str = NULL;
-	long int t;
-	gboolean ret;
-
-	if (nmc_string_to_int_base (value, 0, TRUE,
-	                            NM_SETTING_WIRELESS_POWERSAVE_DEFAULT,
-	                            NM_SETTING_WIRELESS_POWERSAVE_LAST,
-	                            &t))
-		powersave = (NMSettingWirelessPowersave) t;
-	else {
-		ret = nm_utils_enum_from_str (nm_setting_wireless_powersave_get_type (),
-		                              value,
-		                              (int *) &powersave,
-		                              NULL);
-		if (!ret) {
-			options = nm_utils_enum_get_values (nm_setting_wireless_powersave_get_type (),
-			                                    NM_SETTING_WIRELESS_POWERSAVE_DEFAULT,
-			                                    NM_SETTING_WIRELESS_POWERSAVE_LAST);
-			options_str = g_strjoinv (",", (char **) options);
-			g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"), value, options_str);
-			return FALSE;
-		}
-	}
-
-	g_object_set (setting, property_info->property_name, (guint) powersave, NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_wireless_mac_address_randomization (ARGS_SET_FCN)
-{
-	NMSettingMacRandomization randomization;
-	gs_free char *err_token = NULL;
-	gboolean ret;
-	long int t;
-
-	if (nmc_string_to_int_base (value, 0, TRUE,
-	                            NM_SETTING_MAC_RANDOMIZATION_DEFAULT,
-	                            NM_SETTING_MAC_RANDOMIZATION_ALWAYS,
-	                            &t))
-		randomization = (NMSettingMacRandomization) t;
-	else {
-		ret = nm_utils_enum_from_str (nm_setting_mac_randomization_get_type (),
-		                              value,
-		                              (int *) &randomization,
-		                              &err_token);
-
-		if (!ret) {
-			g_set_error (error, 1, 0, _("invalid option '%s', use 'default', 'never' or 'always'"),
-			             err_token);
-			return FALSE;
-		}
-	}
-
-	g_object_set (setting, property_info->property_name, (guint) randomization, NULL);
-	return TRUE;
-}
-
-static char *
-_get_fcn_wireless_security_wep_key0 (ARGS_GET_FCN)
-{
-	NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting);
-	return g_strdup (nm_setting_wireless_security_get_wep_key (s_wireless_sec, 0));
-}
-
-static char *
-_get_fcn_wireless_security_wep_key1 (ARGS_GET_FCN)
-{
-	NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting);
-	return g_strdup (nm_setting_wireless_security_get_wep_key (s_wireless_sec, 1));
-}
-
-static char *
-_get_fcn_wireless_security_wep_key2 (ARGS_GET_FCN)
-{
-	NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting);
-	return g_strdup (nm_setting_wireless_security_get_wep_key (s_wireless_sec, 2));
-}
-
-static char *
-_get_fcn_wireless_security_wep_key3 (ARGS_GET_FCN)
-{
-	NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting);
-	return g_strdup (nm_setting_wireless_security_get_wep_key (s_wireless_sec, 3));
-}
-
-static char *
-_get_fcn_wireless_security_wep_key_type (ARGS_GET_FCN)
-{
-	return wep_key_type_to_string (nm_setting_wireless_security_get_wep_key_type (NM_SETTING_WIRELESS_SECURITY (setting)));
-}
-
-static const char *wifi_sec_valid_protos[] = { "wpa", "rsn", NULL };
-
-DEFINE_SETTER_STR_LIST_MULTI (check_and_add_wifi_sec_proto,
-                              NM_SETTING_WIRELESS_SECURITY,
-                              nm_setting_wireless_security_add_proto)
-
-static gboolean
-_set_fcn_wireless_security_proto (ARGS_SET_FCN)
-{
-	return check_and_add_wifi_sec_proto (setting, property_info->property_name, value, wifi_sec_valid_protos, error);
-}
-
-static gboolean
-_validate_and_remove_wifi_sec_proto (NMSettingWirelessSecurity *setting,
-                                     const char *proto,
-                                     GError **error)
-{
-	gboolean ret;
-	const char *valid;
-
-	valid = nmc_string_is_valid (proto, wifi_sec_valid_protos, error);
-	if (!valid)
-		return FALSE;
-
-	ret = nm_setting_wireless_security_remove_proto_by_value (setting, proto);
-	if (!ret)
-		g_set_error (error, 1, 0,
-		             _("the property doesn't contain protocol '%s'"), proto);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_wireless_security_proto,
-                               NM_SETTING_WIRELESS_SECURITY,
-                               nm_setting_wireless_security_get_num_protos,
-                               nm_setting_wireless_security_remove_proto,
-                               _validate_and_remove_wifi_sec_proto)
-
-static const char *wifi_sec_valid_pairwises[] = { "tkip", "ccmp", NULL };
-
-DEFINE_SETTER_STR_LIST_MULTI (check_and_add_wifi_sec_pairwise,
-                              NM_SETTING_WIRELESS_SECURITY,
-                              nm_setting_wireless_security_add_pairwise)
-
-static gboolean
-_set_fcn_wireless_security_pairwise (ARGS_SET_FCN)
-{
-	return check_and_add_wifi_sec_pairwise (setting, property_info->property_name, value, wifi_sec_valid_pairwises, error);
-}
-
-static gboolean
-_validate_and_remove_wifi_sec_pairwise (NMSettingWirelessSecurity *setting,
-                                        const char *pairwise,
-                                        GError **error)
-{
-	gboolean ret;
-	const char *valid;
-
-	valid = nmc_string_is_valid (pairwise, wifi_sec_valid_pairwises, error);
-	if (!valid)
-		return FALSE;
-
-	ret = nm_setting_wireless_security_remove_pairwise_by_value (setting, pairwise);
-	if (!ret)
-		g_set_error (error, 1, 0,
-		             _("the property doesn't contain protocol '%s'"), pairwise);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_wireless_security_pairwise,
-                               NM_SETTING_WIRELESS_SECURITY,
-                               nm_setting_wireless_security_get_num_pairwise,
-                               nm_setting_wireless_security_remove_pairwise,
-                               _validate_and_remove_wifi_sec_pairwise)
-
-static const char *wifi_sec_valid_groups[] = { "wep40", "wep104", "tkip", "ccmp", NULL };
-
-DEFINE_SETTER_STR_LIST_MULTI (check_and_add_wifi_sec_group,
-                              NM_SETTING_WIRELESS_SECURITY,
-                              nm_setting_wireless_security_add_group)
-
-static gboolean
-_set_fcn_wireless_security_group (ARGS_SET_FCN)
-{
-	return check_and_add_wifi_sec_group (setting, property_info->property_name, value, wifi_sec_valid_groups, error);
-}
-
-static gboolean
-_validate_and_remove_wifi_sec_group (NMSettingWirelessSecurity *setting,
-                                     const char *group,
-                                     GError **error)
-{
-	gboolean ret;
-	const char *valid;
-
-	valid = nmc_string_is_valid (group, wifi_sec_valid_groups, error);
-	if (!valid)
-		return FALSE;
-
-	ret = nm_setting_wireless_security_remove_group_by_value (setting, group);
-	if (!ret)
-		g_set_error (error, 1, 0,
-		             _("the property doesn't contain protocol '%s'"), group);
-	return ret;
-}
-DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_wireless_security_group,
-                               NM_SETTING_WIRELESS_SECURITY,
-                               nm_setting_wireless_security_get_num_groups,
-                               nm_setting_wireless_security_remove_group,
-                               _validate_and_remove_wifi_sec_group)
-
-static gboolean
-_set_fcn_wireless_wep_key (ARGS_SET_FCN)
-{
-	NMWepKeyType guessed_type = NM_WEP_KEY_TYPE_UNKNOWN;
-	NMWepKeyType type;
-	guint32 prev_idx, idx;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	/* Get currently set type */
-	type = nm_setting_wireless_security_get_wep_key_type (NM_SETTING_WIRELESS_SECURITY (setting));
-
-	/* Guess key type */
-	if (nm_utils_wep_key_valid (value, NM_WEP_KEY_TYPE_KEY))
-		guessed_type = NM_WEP_KEY_TYPE_KEY;
-	else if (nm_utils_wep_key_valid (value, NM_WEP_KEY_TYPE_PASSPHRASE))
-		guessed_type = NM_WEP_KEY_TYPE_PASSPHRASE;
-
-	if (guessed_type == NM_WEP_KEY_TYPE_UNKNOWN) {
-		g_set_error (error, 1, 0, _("'%s' is not valid"), value);
-		return FALSE;
-	}
-
-	if (type != NM_WEP_KEY_TYPE_UNKNOWN && type != guessed_type) {
-		if (nm_utils_wep_key_valid (value, type))
-			guessed_type = type;
-		else {
-			g_set_error (error, 1, 0,
-			             _("'%s' not compatible with %s '%s', please change the key or set the right %s first."),
-			             value, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, wep_key_type_to_string (type),
-			             NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE);
-			return FALSE;
-		}
-	}
-	prev_idx = nm_setting_wireless_security_get_wep_tx_keyidx (NM_SETTING_WIRELESS_SECURITY (setting));
-	idx = property_info->property_name[strlen (property_info->property_name) - 1] - '0';
-	g_print (_("WEP key is guessed to be of '%s'\n"), wep_key_type_to_string (guessed_type));
-	if (idx != prev_idx)
-		g_print (_("WEP key index set to '%d'\n"), idx);
-
-	g_object_set (setting, property_info->property_name, value, NULL);
-	g_object_set (setting, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, guessed_type, NULL);
-	if (idx != prev_idx)
-		g_object_set (setting, NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, idx, NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_wireless_security_wep_key_type (ARGS_SET_FCN)
-{
-	unsigned long  type_int;
-	const char *valid_wep_types[] = { "unknown", "key", "passphrase", NULL };
-	const char *type_str = NULL;
-	const char *key0, *key1,* key2, *key3;
-	NMWepKeyType type = NM_WEP_KEY_TYPE_UNKNOWN;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_uint (value, TRUE, 0, 2, &type_int)) {
-		if (!(type_str = nmc_string_is_valid (value, valid_wep_types, NULL))) {
-			g_set_error (error, 1, 0, _("'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"), value);
-			return FALSE;
-		}
-		if (type_str == valid_wep_types[1])
-			type = NM_WEP_KEY_TYPE_KEY;
-		else if (type_str == valid_wep_types[2])
-			type = NM_WEP_KEY_TYPE_PASSPHRASE;
-	} else
-		type = (NMWepKeyType) type_int;
-
-	/* Check type compatibility with set keys */
-	key0 = nm_setting_wireless_security_get_wep_key (NM_SETTING_WIRELESS_SECURITY (setting), 0);
-	key1 = nm_setting_wireless_security_get_wep_key (NM_SETTING_WIRELESS_SECURITY (setting), 1);
-	key2 = nm_setting_wireless_security_get_wep_key (NM_SETTING_WIRELESS_SECURITY (setting), 2);
-	key3 = nm_setting_wireless_security_get_wep_key (NM_SETTING_WIRELESS_SECURITY (setting), 3);
-	if (key0 && !nm_utils_wep_key_valid (key0, type))
-		g_print (_("Warning: '%s' is not compatible with '%s' type, please change or delete the key.\n"),
-		         NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, wep_key_type_to_string (type));
-	if (key1 && !nm_utils_wep_key_valid (key1, type))
-		g_print (_("Warning: '%s' is not compatible with '%s' type, please change or delete the key.\n"),
-		         NM_SETTING_WIRELESS_SECURITY_WEP_KEY1, wep_key_type_to_string (type));
-	if (key2 && !nm_utils_wep_key_valid (key2, type))
-		g_print (_("Warning: '%s' is not compatible with '%s' type, please change or delete the key.\n"),
-		         NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, wep_key_type_to_string (type));
-	if (key3 && !nm_utils_wep_key_valid (key3, type))
-		g_print (_("Warning: '%s' is not compatible with '%s' type, please change or delete the key.\n"),
-		         NM_SETTING_WIRELESS_SECURITY_WEP_KEY3, wep_key_type_to_string (type));
-
-	g_object_set (setting, property_info->property_name, type, NULL);
-	return TRUE;
-}
-
-static gboolean
-_set_fcn_wireless_security_psk (ARGS_SET_FCN)
-{
-	if (!nm_utils_wpa_psk_valid (value)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid PSK"), value);
-		return FALSE;
-	}
-	g_object_set (setting, property_info->property_name, value, NULL);
-	return TRUE;
-}
-
-/*****************************************************************************/
-
-static void
-nmc_value_transform_bool_string (const GValue *src_value,
-                                 GValue       *dest_value)
-{
-	dest_value->data[0].v_pointer = g_strdup (src_value->data[0].v_int ? "yes" : "no");
-}
-
-static void
-nmc_value_transform_char_string (const GValue *src_value,
-                                 GValue       *dest_value)
-{
-	dest_value->data[0].v_pointer = g_strdup_printf ("%c", src_value->data[0].v_uint);
-}
-
-static void __attribute__((constructor))
-register_nmcli_value_transforms (void)
-{
-	g_value_register_transform_func (G_TYPE_BOOLEAN, G_TYPE_STRING, nmc_value_transform_bool_string);
-	g_value_register_transform_func (G_TYPE_CHAR, G_TYPE_STRING, nmc_value_transform_char_string);
-}
-
-/*****************************************************************************/
-
 NMSetting *
 nmc_setting_new_for_name (const char *name)
 {
@@ -4819,7 +911,7 @@ setting_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean
 			                                                            type,
 			                                                            show_secrets));
 		} else
-			set_val_str (arr, i, g_strdup (_(HIDDEN_TEXT)));
+			set_val_str (arr, i, g_strdup (_(NM_META_TEXT_HIDDEN)));
 	}
 
 	g_ptr_array_add (nmc->output_data, arr);
@@ -4828,2173 +920,3 @@ setting_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean
 
 	return TRUE;
 }
-
-/*****************************************************************************/
-
-#define DEFINE_PROPERTY_TYPE(...) \
-	(&((NMMetaPropertyType) { __VA_ARGS__ } ))
-
-#define DEFINE_PROPERTY_TYP_DATA(...) \
-	(&((NMMetaPropertyTypData) { __VA_ARGS__ } ))
-
-#define DEFINE_PROPERTY_TYP_DATA_SUBTYPE(type, ...) \
-	DEFINE_PROPERTY_TYP_DATA ( \
-		.subtype = { .type = { __VA_ARGS__ } } , \
-	)
-
-static const NMMetaPropertyType _pt_name = {
-	.get_fcn =                      _get_fcn_name,
-};
-
-static const NMMetaPropertyType _pt_gobject_readonly = {
-	.get_fcn =                      _get_fcn_gobject,
-};
-
-static const NMMetaPropertyType _pt_gobject_string = {
-	.get_fcn =                      _get_fcn_gobject,
-	.set_fcn =                      _set_fcn_gobject_string,
-};
-
-static const NMMetaPropertyType _pt_gobject_bool = {
-	.get_fcn =                      _get_fcn_gobject,
-	.set_fcn =                      _set_fcn_gobject_bool,
-};
-
-static const NMMetaPropertyType _pt_gobject_int = {
-	.get_fcn =                      _get_fcn_gobject,
-	.set_fcn =                      _set_fcn_gobject_int,
-};
-
-static const NMMetaPropertyType _pt_gobject_int64 = {
-	.get_fcn =                      _get_fcn_gobject,
-	.set_fcn =                      _set_fcn_gobject_int64,
-};
-
-static const NMMetaPropertyType _pt_gobject_uint = {
-	.get_fcn =                      _get_fcn_gobject,
-	.set_fcn =                      _set_fcn_gobject_uint,
-};
-
-static const NMMetaPropertyType _pt_gobject_mtu = {
-	.get_fcn =                      _get_fcn_gobject_mtu,
-	.set_fcn =                      _set_fcn_gobject_mtu,
-};
-
-static const NMMetaPropertyType _pt_gobject_mac = {
-	.get_fcn =                      _get_fcn_gobject,
-	.set_fcn =                      _set_fcn_gobject_mac,
-};
-
-static const NMMetaPropertyType _pt_gobject_secret_flags = {
-	.get_fcn =                      _get_fcn_gobject_secret_flags,
-	.set_fcn =                      _set_fcn_gobject_secret_flags,
-};
-
-/*****************************************************************************/
-
-#define PROPERTY_INFO_NAME() \
-	{ \
-		.property_name =                N_ ("name"), \
-		.is_name                        = TRUE, \
-		.property_type =                &_pt_name, \
-	}
-
-#define VALUES_STATIC(...)  (((const char *[]) { __VA_ARGS__, NULL }))
-
-#define GET_FCN_WITH_DEFAULT(type, func) \
-	/* macro that returns @func as const (gboolean(*)(NMSetting*)) type, but checks
-	 * that the actual type is (gboolean(*)(type *)). */ \
-	((gboolean (*) (NMSetting *)) ((sizeof (func == ((gboolean (*) (type *)) func))) ? func : func) )
-
-#define MTU_GET_FCN(type, func) \
-	/* macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
-	 * that the actual type is (guint32(*)(type *)). */ \
-	((guint32 (*) (NMSetting *)) ((sizeof (func == ((guint32 (*) (type *)) func))) ? func : func) )
-
-#define TEAM_DESCRIBE_MESSAGE \
-	"nmcli can accepts both direct JSON configuration data and a file name containing " \
-	"the configuration. In the latter case the file is read and the contents is put " \
-	"into this property.\n\n" \
-	"Examples: set team.config " \
-	"{ \"device\": \"team0\", \"runner\": {\"name\": \"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n" \
-	"          set team.config /etc/my-team.conf\n"
-
-static const NMMetaPropertyInfo property_infos_802_1x[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_EAP),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_gobject_string,
-			.remove_fcn =               _remove_fcn_802_1x_eap,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("leap", "md5", "tls", "peap", "ttls", "sim", "fast", "pwd"),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_IDENTITY),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_ANONYMOUS_IDENTITY),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PAC_FILE),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_CA_CERT),
-		.describe_message =
-		    N_ ("Enter file path to CA certificate (optionally prefixed with file://).\n"
-		        "  [file://]<file path>\n"
-		        "Note that nmcli does not support specifying certificates as raw blob data.\n"
-		        "Example: /home/cimrman/cacert.crt\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_802_1x_ca_cert,
-			.set_fcn =                  _set_fcn_802_1x_ca_cert,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_CA_CERT_PASSWORD),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_CA_PATH),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_SUBJECT_MATCH),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_ALTSUBJECT_MATCHES),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_802_1x_altsubject_matches,
-			.remove_fcn =               _remove_fcn_802_1x_altsubject_matches,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_CLIENT_CERT),
-		.describe_message =
-		    N_ ("Enter file path to client certificate (optionally prefixed with file://).\n"
-		         "  [file://]<file path>\n"
-		         "Note that nmcli does not support specifying certificates as raw blob data.\n"
-		         "Example: /home/cimrman/jara.crt\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_802_1x_client_cert,
-			.set_fcn =                  _set_fcn_802_1x_client_cert,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_CLIENT_CERT_PASSWORD),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE1_PEAPVER),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("0", "1"),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE1_PEAPLABEL),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("0", "1"),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("0", "1", "2", "3"),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE1_AUTH_FLAGS),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_802_1x_phase1_auth_flags,
-			.set_fcn =                  _set_fcn_802_1x_phase1_auth_flags,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_AUTH),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", "tls"),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_AUTHEAP),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("md5", "mschapv2", "otp", "gtc", "tls"),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_CA_CERT),
-		.describe_message =
-		    N_ ("Enter file path to CA certificate for inner authentication (optionally prefixed\n"
-		        "with file://).\n"
-		        "  [file://]<file path>\n"
-		        "Note that nmcli does not support specifying certificates as raw blob data.\n"
-		        "Example: /home/cimrman/ca-zweite-phase.crt\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_802_1x_phase2_ca_cert,
-			.set_fcn =                  _set_fcn_802_1x_phase2_ca_cert,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_CA_PATH),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_802_1x_phase2_altsubject_matches,
-			.remove_fcn =               _remove_fcn_802_1x_phase2_altsubject_matches,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_CLIENT_CERT),
-		.describe_message =
-		    N_ ("Enter file path to client certificate for inner authentication (optionally prefixed\n"
-		        "with file://).\n"
-		        "  [file://]<file path>\n"
-		        "Note that nmcli does not support specifying certificates as raw blob data.\n"
-		        "Example: /home/cimrman/jara-zweite-phase.crt\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_802_1x_phase2_client_cert,
-			.set_fcn =                  _set_fcn_802_1x_phase2_client_cert,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PASSWORD),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PASSWORD_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PASSWORD_RAW),
-		.is_secret =                    TRUE,
-		.describe_message =
-		    N_ ("Enter bytes as a list of hexadecimal values.\n"
-		        "Two formats are accepted:\n"
-		        "(a) a string of hexadecimal digits, where each two digits represent one byte\n"
-		        "(b) space-separated list of bytes written as hexadecimal digits "
-		        "(with optional 0x/0X prefix, and optional leading 0).\n\n"
-		        "Examples: ab0455a6ea3a74C2\n"
-		        "          ab 4 55 0xa6 ea 3a 74 C2\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_802_1x_password_raw,
-			.set_fcn =                  _set_fcn_802_1x_password_raw,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PASSWORD_RAW_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PRIVATE_KEY),
-		.describe_message =
-		    N_ ("Enter path to a private key and the key password (if not set yet):\n"
-		        "  [file://]<file path> [<password>]\n"
-		        "Note that nmcli does not support specifying private key as raw blob data.\n"
-		        "Example: /home/cimrman/jara-priv-key Dardanely\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_802_1x_private_key,
-			.set_fcn =                  _set_fcn_802_1x_private_key,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY),
-		.describe_message =
-		    N_ ("Enter path to a private key and the key password (if not set yet):\n"
-		        "  [file://]<file path> [<password>]\n"
-		        "Note that nmcli does not support specifying private key as raw blob data.\n"
-		        "Example: /home/cimrman/jara-priv-key Dardanely\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_802_1x_phase2_private_key,
-			.set_fcn =                  _set_fcn_802_1x_phase2_private_key,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PIN),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_PIN_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_SYSTEM_CA_CERTS),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_802_1X_AUTH_TIMEOUT),
-		.property_type =                &_pt_gobject_int,
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_adsl[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_ADSL_USERNAME),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_ADSL_PASSWORD),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_ADSL_PASSWORD_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_ADSL_PROTOCOL),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC (NM_SETTING_ADSL_PROTOCOL_PPPOA,
-			                                           NM_SETTING_ADSL_PROTOCOL_PPPOE,
-			                                           NM_SETTING_ADSL_PROTOCOL_IPOATM),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_ADSL_ENCAPSULATION),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC (NM_SETTING_ADSL_ENCAPSULATION_VCMUX,
-			                                           NM_SETTING_ADSL_ENCAPSULATION_LLC),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_ADSL_VPI),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_ADSL_VCI),
-		.property_type =                &_pt_gobject_uint,
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_bluetooth[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_BLUETOOTH_BDADDR),
-		.property_type =                &_pt_gobject_mac,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_BLUETOOTH_TYPE),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC (NM_SETTING_BLUETOOTH_TYPE_DUN,
-			                                           NM_SETTING_BLUETOOTH_TYPE_PANU),
-		),
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_bond[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_BOND_OPTIONS),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.describe_fcn =             _describe_fcn_bond_options,
-			.get_fcn =                  _get_fcn_bond_options,
-			.set_fcn =                  _set_fcn_bond_options,
-			.remove_fcn =               _remove_fcn_bond_options,
-			.values_fcn =               _values_fcn_bond_options,
-		),
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_bridge[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_BRIDGE_MAC_ADDRESS),
-		.property_type =                &_pt_gobject_mac,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_BRIDGE_STP),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_BRIDGE_PRIORITY),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_BRIDGE_FORWARD_DELAY),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_BRIDGE_HELLO_TIME),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_BRIDGE_MAX_AGE),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_BRIDGE_AGEING_TIME),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_BRIDGE_MULTICAST_SNOOPING),
-		.property_type =                &_pt_gobject_bool,
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_bridge_port[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_BRIDGE_PORT_PRIORITY),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_BRIDGE_PORT_PATH_COST),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE),
-		.property_type =                &_pt_gobject_bool,
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_cdma[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_CDMA_NUMBER),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CDMA_USERNAME),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CDMA_PASSWORD),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CDMA_PASSWORD_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CDMA_MTU),
-		.property_type =                &_pt_gobject_mtu,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
-			.get_fcn =                  MTU_GET_FCN (NMSettingCdma, nm_setting_cdma_get_mtu),
-		),
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_connection[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_ID),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_UUID),
-		.property_type =                DEFINE_PROPERTY_TYPE ( .get_fcn = _get_fcn_gobject ),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_STABLE_ID),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_INTERFACE_NAME),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_gobject_ifname,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_TYPE),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_connection_type,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_AUTOCONNECT),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY),
-		.property_type =                &_pt_gobject_int,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_connection_autoconnect_retires,
-			.set_fcn =                  _set_fcn_gobject_int,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_TIMESTAMP),
-		.property_type =                &_pt_gobject_readonly,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_READ_ONLY),
-		.property_type =                &_pt_gobject_readonly,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_PERMISSIONS),
-		.describe_message =
-		     N_ ("Enter a list of user permissions. This is a list of user names formatted as:\n"
-		         "  [user:]<user name 1>, [user:]<user name 2>,...\n"
-		         "The items can be separated by commas or spaces.\n\n"
-		         "Example: alice bob charlie\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_connection_permissions,
-			.set_fcn =                  _set_fcn_connection_permissions,
-			.remove_fcn =               _remove_fcn_connection_permissions,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_ZONE),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_MASTER),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_connection_master,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_SLAVE_TYPE),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC (NM_SETTING_BOND_SETTING_NAME,
-			                                           NM_SETTING_BRIDGE_SETTING_NAME,
-			                                           NM_SETTING_TEAM_SETTING_NAME),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_connection_autoconnect_slaves,
-			.set_fcn =                  _set_fcn_gobject_trilean,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_SECONDARIES),
-		.describe_message =
-		    N_ ("Enter secondary connections that should be activated when this connection is\n"
-		         "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
-		         "transparently translates names to UUIDs. Note that NetworkManager only supports\n"
-		         "VPNs as secondary connections at the moment.\n"
-		         "The items can be separated by commas or spaces.\n\n"
-		         "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_connection_secondaries,
-			.remove_fcn =               _remove_fcn_connection_secondaries,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_METERED),
-		.describe_message =
-		    N_ ("Enter a value which indicates whether the connection is subject to a data\n"
-		        "quota, usage costs or other limitations. Accepted options are:\n"
-		        "'true','yes','on' to set the connection as metered\n"
-		        "'false','no','off' to set the connection as not metered\n"
-		        "'unknown' to let NetworkManager choose a value using some heuristics\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_connection_metered,
-			.set_fcn =                  _set_fcn_connection_metered,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("yes", "no", "unknown"),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_CONNECTION_LLDP),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_connection_lldp,
-			.set_fcn =                  _set_fcn_connection_lldp,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("default", "disable", "enable-rx"),
-		),
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_dcb[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_DCB_APP_FCOE_FLAGS),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_dcb_app_fcoe_flags,
-			.set_fcn =                  _set_fcn_dcb_flags,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_DCB_APP_FCOE_PRIORITY),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_dcb_app_fcoe_priority,
-			.set_fcn =                  _set_fcn_dcb_priority,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_DCB_APP_FCOE_MODE),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC (NM_SETTING_DCB_FCOE_MODE_FABRIC,
-			                                           NM_SETTING_DCB_FCOE_MODE_VN2VN),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_DCB_APP_ISCSI_FLAGS),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_dcb_app_iscsi_flags,
-			.set_fcn =                  _set_fcn_dcb_flags,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_DCB_APP_ISCSI_PRIORITY),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_dcb_app_iscsi_priority,
-			.set_fcn =                  _set_fcn_dcb_priority,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_DCB_APP_FIP_FLAGS),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_dcb_app_fip_flags,
-			.set_fcn =                  _set_fcn_dcb_flags,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_DCB_APP_FIP_PRIORITY),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_dcb_app_fip_priority,
-			.set_fcn =                  _set_fcn_dcb_priority,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_dcb_priority_flow_control_flags,
-			.set_fcn =                  _set_fcn_dcb_flags,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_dcb_priority_flow_control,
-			.set_fcn =                  _set_fcn_dcb_priority_flow_control,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_DCB_PRIORITY_GROUP_FLAGS),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_dcb_priority_group_flags,
-			.set_fcn =                  _set_fcn_dcb_flags,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_DCB_PRIORITY_GROUP_ID),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_dcb_priority_group_id,
-			.set_fcn =                  _set_fcn_dcb_priority_group_id,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_dcb_priority_group_bandwidth,
-			.set_fcn =                  _set_fcn_dcb_priority_group_bandwidth,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_DCB_PRIORITY_BANDWIDTH),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_dcb_priority_bandwidth,
-			.set_fcn =                  _set_fcn_dcb_priority_bandwidth,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_dcb_priority_strict,
-			.set_fcn =                  _set_fcn_dcb_priority_strict,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_dcb_priority_traffic_class,
-			.set_fcn =                  _set_fcn_dcb_priority_traffic_class,
-		),
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_dummy[] = {
-	PROPERTY_INFO_NAME(),
-};
-
-static const NMMetaPropertyInfo property_infos_gsm[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_GSM_NUMBER),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_GSM_USERNAME),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_GSM_PASSWORD),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_GSM_PASSWORD_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_GSM_APN),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_GSM_NETWORK_ID),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_GSM_PIN),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_GSM_PIN_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_GSM_HOME_ONLY),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_GSM_DEVICE_ID),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_GSM_SIM_ID),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_GSM_SIM_OPERATOR_ID),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_gsm_sim_operator_id,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_GSM_MTU),
-		.property_type =                &_pt_gobject_mtu,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
-			.get_fcn =                  MTU_GET_FCN (NMSettingGsm, nm_setting_gsm_get_mtu),
-		),
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_infiniband[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_INFINIBAND_MAC_ADDRESS),
-		.property_type =                &_pt_gobject_mac,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac,
-			.mode =                     NM_META_PROPERTY_TYPE_MAC_MODE_INFINIBAND,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_INFINIBAND_MTU),
-		.property_type =                &_pt_gobject_mtu,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
-			.get_fcn =                  MTU_GET_FCN (NMSettingInfiniband, nm_setting_infiniband_get_mtu),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_INFINIBAND_TRANSPORT_MODE),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("datagram", "connected"),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_INFINIBAND_P_KEY),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_infiniband_p_key,
-			.set_fcn =                  _set_fcn_infiniband_p_key,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_INFINIBAND_PARENT),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_gobject_ifname,
-		),
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_ip4_config[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_METHOD),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_ip4_config_method,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            ipv4_valid_methods,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_DNS),
-		.describe_message =
-		    N_ ("Enter a list of IPv4 addresses of DNS servers.\n\n"
-		        "Example: 8.8.8.8, 8.8.4.4\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_ip4_config_dns,
-			.remove_fcn =               _remove_fcn_ipv4_config_dns,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_DNS_SEARCH),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_ip4_config_dns_search,
-			.remove_fcn =               _remove_fcn_ipv4_config_dns_search,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_DNS_OPTIONS),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_nmc_with_default,
-			.set_fcn =                  _set_fcn_ip4_config_dns_options,
-			.remove_fcn =               _remove_fcn_ipv4_config_dns_options,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (get_with_default,
-			.fcn =                      GET_FCN_WITH_DEFAULT (NMSettingIPConfig, nm_setting_ip_config_has_dns_options),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_DNS_PRIORITY),
-		.property_type =                &_pt_gobject_int,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_ADDRESSES),
-		.describe_message =
-		    N_ ("Enter a list of IPv4 addresses formatted as:\n"
-		        "  ip[/prefix], ip[/prefix],...\n"
-		        "Missing prefix is regarded as prefix of 32.\n\n"
-		        "Example: 192.168.1.5/24, 10.0.0.11/24\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_ip_config_addresses,
-			.set_fcn =                  _set_fcn_ip4_config_addresses,
-			.remove_fcn =               _remove_fcn_ipv4_config_addresses,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_GATEWAY),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_ip4_config_gateway,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_ROUTES),
-		.describe_message =
-		    N_ ("Enter a list of IPv4 routes formatted as:\n"
-		         "  ip[/prefix] [next-hop] [metric],...\n\n"
-		         "Missing prefix is regarded as a prefix of 32.\n"
-		         "Missing next-hop is regarded as 0.0.0.0.\n"
-		         "Missing metric means default (NM/kernel will set a default value).\n\n"
-		         "Examples: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
-		         "          10.1.2.0/24\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_ip_config_routes,
-			.set_fcn =                  _set_fcn_ip4_config_routes,
-			.remove_fcn =               _remove_fcn_ipv4_config_routes,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_ROUTE_METRIC),
-		.property_type =                &_pt_gobject_int64,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT),
-		.property_type =                &_pt_gobject_int,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP4_CONFIG_DHCP_FQDN),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_NEVER_DEFAULT),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_MAY_FAIL),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_DAD_TIMEOUT),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_ip4_config_dad_timeout,
-			.set_fcn =                  _set_fcn_gobject_int,
-		),
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_ip6_config[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_METHOD),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_ip6_config_method,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            ipv6_valid_methods,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_DNS),
-		.describe_message =
-		    N_ ("Enter a list of IPv6 addresses of DNS servers.  If the IPv6 "
-		        "configuration method is 'auto' these DNS servers are appended "
-		        "to those (if any) returned by automatic configuration.  DNS "
-		        "servers cannot be used with the 'shared' or 'link-local' IPv6 "
-		        "configuration methods, as there is no upstream network. In "
-		        "all other IPv6 configuration methods, these DNS "
-		        "servers are used as the only DNS servers for this connection.\n\n"
-		        "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_ip6_config_dns,
-			.remove_fcn =               _remove_fcn_ipv6_config_dns,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_DNS_SEARCH),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_ip6_config_dns_search,
-			.remove_fcn =               _remove_fcn_ipv6_config_dns_search,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_DNS_OPTIONS),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_nmc_with_default,
-			.set_fcn =                  _set_fcn_ip6_config_dns_options,
-			.remove_fcn =               _remove_fcn_ipv6_config_dns_options,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (get_with_default,
-			.fcn =     GET_FCN_WITH_DEFAULT (NMSettingIPConfig, nm_setting_ip_config_has_dns_options),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_DNS_PRIORITY),
-		.property_type =                &_pt_gobject_int,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_ADDRESSES),
-		.describe_message =
-		    N_ ("Enter a list of IPv6 addresses formatted as:\n"
-		        "  ip[/prefix], ip[/prefix],...\n"
-		        "Missing prefix is regarded as prefix of 128.\n\n"
-		        "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_ip_config_addresses,
-			.set_fcn =                  _set_fcn_ip6_config_addresses,
-			.remove_fcn =               _remove_fcn_ipv6_config_addresses,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_GATEWAY),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_ip6_config_gateway,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_ROUTES),
-		.describe_message =
-		    N_ ("Enter a list of IPv6 routes formatted as:\n"
-		        "  ip[/prefix] [next-hop] [metric],...\n\n"
-		        "Missing prefix is regarded as a prefix of 128.\n"
-		        "Missing next-hop is regarded as \"::\".\n"
-		        "Missing metric means default (NM/kernel will set a default value).\n\n"
-		         "Examples: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef::3 2\n"
-		        "          abbe::/64 55\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_ip_config_routes,
-			.set_fcn =                  _set_fcn_ip6_config_routes,
-			.remove_fcn =               _remove_fcn_ipv6_config_routes,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_ROUTE_METRIC),
-		.property_type =                &_pt_gobject_int64,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_NEVER_DEFAULT),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_MAY_FAIL),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP6_CONFIG_IP6_PRIVACY),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_ip6_config_ip6_privacy,
-			.set_fcn =                  _set_fcn_ip6_config_ip6_privacy,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_ip6_config_addr_gen_mode,
-			.set_fcn =                  _set_fcn_ip6_config_addr_gen_mode,
-			.values_fcn =               _values_fcn_gobject_enum,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-			.get_gtype =                nm_setting_ip6_config_addr_gen_mode_get_type,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP6_CONFIG_TOKEN),
-		.property_type =                &_pt_gobject_string,
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_ip_tunnel[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_IP_TUNNEL_MODE),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_ip_tunnel_mode,
-			.set_fcn =                  _set_fcn_ip_tunnel_mode,
-			.values_fcn =               _values_fcn_gobject_enum,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-			.get_gtype =        nm_ip_tunnel_mode_get_type,
-			.min =              NM_IP_TUNNEL_MODE_UNKNOWN + 1,
-			.max =              G_MAXINT,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_TUNNEL_PARENT),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_TUNNEL_LOCAL),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_TUNNEL_REMOTE),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_TUNNEL_TTL),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_TUNNEL_TOS),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_TUNNEL_INPUT_KEY),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_TUNNEL_OUTPUT_KEY),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_TUNNEL_FLOW_LABEL),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_IP_TUNNEL_MTU),
-		.property_type =                &_pt_gobject_mtu,
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_macsec[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_MACSEC_PARENT),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_MACSEC_MODE),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_macsec_mode,
-			.set_fcn =                  _set_fcn_macsec_mode,
-			.values_fcn =               _values_fcn_gobject_enum,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-			.get_gtype =        nm_setting_macsec_mode_get_type,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_MACSEC_ENCRYPT),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_MACSEC_MKA_CAK),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_MACSEC_MKA_CAK_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_MACSEC_MKA_CKN),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_MACSEC_PORT),
-		.property_type =                &_pt_gobject_int,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_MACSEC_VALIDATION),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_macsec_validation,
-			.set_fcn =                  _set_fcn_macsec_validation,
-			.values_fcn =               _values_fcn_gobject_enum,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-			.get_gtype =        nm_setting_macsec_validation_get_type,
-		),
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_macvlan[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_MACVLAN_PARENT),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_MACVLAN_MODE),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_macvlan_mode,
-			.set_fcn =                  _set_fcn_macvlan_mode,
-			.values_fcn =               _values_fcn_gobject_enum,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-			.get_gtype =        nm_setting_macvlan_mode_get_type,
-			.min =              NM_SETTING_MACVLAN_MODE_UNKNOWN + 1,
-			.max =              G_MAXINT,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_MACVLAN_PROMISCUOUS),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_MACVLAN_TAP),
-		.property_type =                &_pt_gobject_bool,
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_olpc_mesh[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_OLPC_MESH_SSID),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_olpc_mesh_ssid,
-			.set_fcn =                  _set_fcn_gobject_ssid,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_OLPC_MESH_CHANNEL),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_olpc_mesh_channel,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS),
-		.property_type =                &_pt_gobject_mac,
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_pppoe[] = {
-	PROPERTY_INFO_NAME (),
-	{
-		.property_name =                N_ (NM_SETTING_PPPOE_SERVICE),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPPOE_USERNAME),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPPOE_PASSWORD),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPPOE_PASSWORD_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_ppp[] = {
-	PROPERTY_INFO_NAME (),
-	{
-		.property_name =                N_ (NM_SETTING_PPP_NOAUTH),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPP_REFUSE_EAP),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPP_REFUSE_PAP),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPP_REFUSE_CHAP),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPP_REFUSE_MSCHAP),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPP_REFUSE_MSCHAPV2),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPP_NOBSDCOMP),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPP_NODEFLATE),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPP_NO_VJ_COMP),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPP_REQUIRE_MPPE),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPP_REQUIRE_MPPE_128),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPP_MPPE_STATEFUL),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPP_CRTSCTS),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPP_BAUD),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPP_MRU),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPP_MTU),
-		.property_type =                &_pt_gobject_mtu,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
-			.get_fcn =                  MTU_GET_FCN (NMSettingPpp, nm_setting_ppp_get_mtu),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPP_LCP_ECHO_FAILURE),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PPP_LCP_ECHO_INTERVAL),
-		.property_type =                &_pt_gobject_uint,
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_proxy[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_PROXY_METHOD),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_proxy_method,
-			.set_fcn =                  _set_fcn_proxy_method,
-			.values_fcn =               _values_fcn_gobject_enum,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-			.get_gtype =        nm_setting_proxy_method_get_type,
-			.min =              NM_SETTING_PROXY_METHOD_NONE,
-			.max =              G_MAXINT,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PROXY_BROWSER_ONLY),
-		.property_type =                &_pt_gobject_bool
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PROXY_PAC_URL),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_PROXY_PAC_SCRIPT),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_proxy_pac_script,
-		),
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_team[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_TEAM_CONFIG),
-		.describe_message =             N_ (TEAM_DESCRIBE_MESSAGE),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_team_config,
-		),
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_team_port[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_TEAM_PORT_CONFIG),
-		.describe_message =             N_ (TEAM_DESCRIBE_MESSAGE),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_team_config,
-		),
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_tun[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_TUN_MODE),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_tun_mode,
-			.set_fcn =                  _set_fcn_tun_mode,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("tun", "tap", "unknown"),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_TUN_OWNER),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_TUN_GROUP),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_TUN_PI),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_TUN_VNET_HDR),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_TUN_MULTI_QUEUE),
-		.property_type =                &_pt_gobject_bool,
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_serial[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_SERIAL_BAUD),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_SERIAL_BITS),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_SERIAL_PARITY),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_serial_parity,
-			.set_fcn =                  _set_fcn_serial_parity,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_SERIAL_STOPBITS),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_SERIAL_SEND_DELAY),
-		.property_type =                &_pt_gobject_uint,
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_vlan[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_VLAN_PARENT),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VLAN_ID),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VLAN_FLAGS),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_vlan_flags,
-			.set_fcn =                  _set_fcn_gobject_flags,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VLAN_INGRESS_PRIORITY_MAP),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_vlan_ingress_priority_map,
-			.set_fcn =                  _set_fcn_vlan_ingress_priority_map,
-			.remove_fcn =               _remove_fcn_vlan_ingress_priority_map,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VLAN_EGRESS_PRIORITY_MAP),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_vlan_egress_priority_map,
-			.set_fcn =                  _set_fcn_vlan_egress_priority_map,
-			.remove_fcn =               _remove_fcn_vlan_egress_priority_map,
-		),
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_vpn[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_VPN_SERVICE_TYPE),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_vpn_service_type,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VPN_USER_NAME),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VPN_DATA),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_vpn_data,
-			.set_fcn =                  _set_fcn_vpn_data,
-			.remove_fcn =               _remove_fcn_vpn_data,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VPN_SECRETS),
-		.is_secret =                    TRUE,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_vpn_secrets,
-			.set_fcn =                  _set_fcn_vpn_secrets,
-			.remove_fcn =               _remove_fcn_vpn_secrets,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VPN_PERSISTENT),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VPN_TIMEOUT),
-		.property_type =                &_pt_gobject_uint,
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_vxlan[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_VXLAN_PARENT),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VXLAN_ID),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VXLAN_LOCAL),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VXLAN_REMOTE),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VXLAN_SOURCE_PORT_MIN),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VXLAN_SOURCE_PORT_MAX),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VXLAN_DESTINATION_PORT),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VXLAN_TOS),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VXLAN_TTL),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VXLAN_AGEING),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VXLAN_LIMIT),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VXLAN_LEARNING),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VXLAN_PROXY),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VXLAN_RSC),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VXLAN_L2_MISS),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_VXLAN_L3_MISS),
-		.property_type =                &_pt_gobject_bool,
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_wimax[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_WIMAX_MAC_ADDRESS),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIMAX_NETWORK_NAME),
-		.property_type =                &_pt_gobject_mac,
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_wired[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_WIRED_PORT),
-		/* Do not allow setting 'port' for now. It is not implemented in
-		 * NM core, nor in ifcfg-rh plugin. Enable this when it gets done.
-		 * wired_valid_ports[] = { "tp", "aui", "bnc", "mii", NULL };
-		 */
-		.property_type =                &_pt_gobject_readonly,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRED_SPEED),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRED_DUPLEX),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("half", "full"),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRED_AUTO_NEGOTIATE),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRED_MAC_ADDRESS),
-		.property_type =                &_pt_gobject_mac,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRED_CLONED_MAC_ADDRESS),
-		.property_type =                &_pt_gobject_mac,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac,
-			.mode =                     NM_META_PROPERTY_TYPE_MAC_MODE_CLONED,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_wired_mac_address_blacklist,
-			.remove_fcn =               _remove_fcn_wired_mac_address_blacklist,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRED_MTU),
-		.property_type =                &_pt_gobject_mtu,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
-			.get_fcn =                  MTU_GET_FCN (NMSettingWired, nm_setting_wired_get_mtu),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRED_S390_SUBCHANNELS),
-		.describe_message =
-		    N_ ("Enter a list of subchannels (comma or space separated).\n\n"
-		        "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_wired_s390_subchannels,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRED_S390_NETTYPE),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("qeth", "lcs", "ctc"),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRED_S390_OPTIONS),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.describe_fcn =             _describe_fcn_wired_s390_options,
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_wired_s390_options,
-			.remove_fcn =               _remove_fcn_wired_s390_options,
-			.values_fcn =               _values_fcn__wired_s390_options,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRED_WAKE_ON_LAN),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_wired_wake_on_lan,
-			.set_fcn =                  _set_fcn_wired_wake_on_lan,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD),
-		.property_type =                &_pt_gobject_mac,
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_wireless[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SSID),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_wireless_ssid,
-			.set_fcn =                  _set_fcn_gobject_ssid,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_MODE),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC (NM_SETTING_WIRELESS_MODE_INFRA,
-			                                           NM_SETTING_WIRELESS_MODE_ADHOC,
-			                                           NM_SETTING_WIRELESS_MODE_AP),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_BAND),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("a", "bg"),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_CHANNEL),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_wireless_channel,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_BSSID),
-		.property_type =                &_pt_gobject_mac,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_RATE),
-		/* Do not allow setting 'rate'. It is not implemented in NM core. */
-		.property_type =                &_pt_gobject_readonly,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_TX_POWER),
-		/* Do not allow setting 'tx-power'. It is not implemented in NM core. */
-		.property_type =                &_pt_gobject_readonly,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_MAC_ADDRESS),
-		.property_type =                &_pt_gobject_mac,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS),
-		.property_type =                &_pt_gobject_mac,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac,
-			.mode =                     NM_META_PROPERTY_TYPE_MAC_MODE_CLONED,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_wireless_mac_address_blacklist,
-			.remove_fcn =               _remove_fcn_wireless_mac_address_blacklist,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_wireless_mac_address_randomization,
-			.set_fcn =                  _set_fcn_wireless_mac_address_randomization,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_MTU),
-		.property_type =                &_pt_gobject_mtu,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
-			.get_fcn =                  MTU_GET_FCN (NMSettingWireless, nm_setting_wireless_get_mtu),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SEEN_BSSIDS),
-		.property_type =                &_pt_gobject_readonly,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_HIDDEN),
-		.property_type =                &_pt_gobject_bool,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_POWERSAVE),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_wireless_powersave,
-			.set_fcn =                  _set_fcn_wireless_powersave,
-		),
-	},
-};
-
-static const NMMetaPropertyInfo property_infos_wireless_security[] = {
-	PROPERTY_INFO_NAME(),
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("none", "ieee8021x", "wpa-none", "wpa-psk", "wpa-eap"),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX),
-		.property_type =                &_pt_gobject_uint,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_AUTH_ALG),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            VALUES_STATIC ("open", "shared", "leap"),
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_PROTO),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_wireless_security_proto,
-			.remove_fcn =               _remove_fcn_wireless_security_proto,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            wifi_sec_valid_protos,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_PAIRWISE),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_wireless_security_pairwise,
-			.remove_fcn =               _remove_fcn_wireless_security_pairwise,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            wifi_sec_valid_pairwises,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_GROUP),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_wireless_security_group,
-			.remove_fcn =               _remove_fcn_wireless_security_group,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            wifi_sec_valid_groups,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME),
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY0),
-		.is_secret =                    TRUE,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_wireless_security_wep_key0,
-			.set_fcn =                  _set_fcn_wireless_wep_key,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY1),
-		.is_secret =                    TRUE,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_wireless_security_wep_key1,
-			.set_fcn =                  _set_fcn_wireless_wep_key,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY2),
-		.is_secret =                    TRUE,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_wireless_security_wep_key2,
-			.set_fcn =                  _set_fcn_wireless_wep_key,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY3),
-		.is_secret =                    TRUE,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_wireless_security_wep_key3,
-			.set_fcn =                  _set_fcn_wireless_wep_key,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE),
-		.describe_message =
-		    N_ ("Enter the type of WEP keys. The accepted values are: "
-		        "0 or unknown, 1 or key, and 2 or passphrase.\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_wireless_security_wep_key_type,
-			.set_fcn =                  _set_fcn_wireless_security_wep_key_type,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_PSK),
-		.is_secret =                    TRUE,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_wireless_security_psk,
-		),
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
-	},
-	{
-		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS),
-		.property_type =                &_pt_gobject_secret_flags,
-	},
-};
-
-const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[_NM_META_SETTING_TYPE_NUM] = {
-	[NM_META_SETTING_TYPE_802_1X] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_802_1X],
-		.properties                         = property_infos_802_1x,
-		.properties_num                     = G_N_ELEMENTS (property_infos_802_1x),
-	},
-	[NM_META_SETTING_TYPE_ADSL] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_ADSL],
-		.properties                         = property_infos_adsl,
-		.properties_num                     = G_N_ELEMENTS (property_infos_adsl),
-	},
-	[NM_META_SETTING_TYPE_BLUETOOTH] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_BLUETOOTH],
-		.properties                         = property_infos_bluetooth,
-		.properties_num                     = G_N_ELEMENTS (property_infos_bluetooth),
-	},
-	[NM_META_SETTING_TYPE_BOND] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_BOND],
-		.properties                         = property_infos_bond,
-		.properties_num                     = G_N_ELEMENTS (property_infos_bond),
-	},
-	[NM_META_SETTING_TYPE_BRIDGE] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_BRIDGE],
-		.properties                         = property_infos_bridge,
-		.properties_num                     = G_N_ELEMENTS (property_infos_bridge),
-	},
-	[NM_META_SETTING_TYPE_BRIDGE_PORT] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_BRIDGE_PORT],
-		.properties                         = property_infos_bridge_port,
-		.properties_num                     = G_N_ELEMENTS (property_infos_bridge_port),
-	},
-	[NM_META_SETTING_TYPE_CDMA] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_CDMA],
-		.properties                         = property_infos_cdma,
-		.properties_num                     = G_N_ELEMENTS (property_infos_cdma),
-	},
-	[NM_META_SETTING_TYPE_CONNECTION] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_CONNECTION],
-		.properties                         = property_infos_connection,
-		.properties_num                     = G_N_ELEMENTS (property_infos_connection),
-	},
-	[NM_META_SETTING_TYPE_DCB] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_DCB],
-		.properties                         = property_infos_dcb,
-		.properties_num                     = G_N_ELEMENTS (property_infos_dcb),
-	},
-	[NM_META_SETTING_TYPE_DUMMY] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_DUMMY],
-		.properties                         = property_infos_dummy,
-		.properties_num                     = G_N_ELEMENTS (property_infos_dummy),
-	},
-	[NM_META_SETTING_TYPE_GSM] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_GSM],
-		.properties                         = property_infos_gsm,
-		.properties_num                     = G_N_ELEMENTS (property_infos_gsm),
-	},
-	[NM_META_SETTING_TYPE_INFINIBAND] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_INFINIBAND],
-		.properties                         = property_infos_infiniband,
-		.properties_num                     = G_N_ELEMENTS (property_infos_infiniband),
-	},
-	[NM_META_SETTING_TYPE_IP4_CONFIG] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_IP4_CONFIG],
-		.properties                         = property_infos_ip4_config,
-		.properties_num                     = G_N_ELEMENTS (property_infos_ip4_config),
-	},
-	[NM_META_SETTING_TYPE_IP6_CONFIG] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_IP6_CONFIG],
-		.properties                         = property_infos_ip6_config,
-		.properties_num                     = G_N_ELEMENTS (property_infos_ip6_config),
-	},
-	[NM_META_SETTING_TYPE_IP_TUNNEL] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_IP_TUNNEL],
-		.properties                         = property_infos_ip_tunnel,
-		.properties_num                     = G_N_ELEMENTS (property_infos_ip_tunnel),
-	},
-	[NM_META_SETTING_TYPE_MACSEC] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_MACSEC],
-		.properties                         = property_infos_macsec,
-		.properties_num                     = G_N_ELEMENTS (property_infos_macsec),
-	},
-	[NM_META_SETTING_TYPE_MACVLAN] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_MACVLAN],
-		.properties                         = property_infos_macvlan,
-		.properties_num                     = G_N_ELEMENTS (property_infos_macvlan),
-	},
-	[NM_META_SETTING_TYPE_OLPC_MESH] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_OLPC_MESH],
-		.properties                         = property_infos_olpc_mesh,
-		.properties_num                     = G_N_ELEMENTS (property_infos_olpc_mesh),
-	},
-	[NM_META_SETTING_TYPE_PPPOE] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_PPPOE],
-		.properties                         = property_infos_pppoe,
-		.properties_num                     = G_N_ELEMENTS (property_infos_pppoe),
-	},
-	[NM_META_SETTING_TYPE_PPP] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_PPP],
-		.properties                         = property_infos_ppp,
-		.properties_num                     = G_N_ELEMENTS (property_infos_ppp),
-	},
-	[NM_META_SETTING_TYPE_PROXY] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_PROXY],
-		.properties                         = property_infos_proxy,
-		.properties_num                     = G_N_ELEMENTS (property_infos_proxy),
-	},
-	[NM_META_SETTING_TYPE_SERIAL] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_SERIAL],
-		.properties                         = property_infos_serial,
-		.properties_num                     = G_N_ELEMENTS (property_infos_serial),
-	},
-	[NM_META_SETTING_TYPE_TEAM] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_TEAM],
-		.properties                         = property_infos_team,
-		.properties_num                     = G_N_ELEMENTS (property_infos_team),
-	},
-	[NM_META_SETTING_TYPE_TEAM_PORT] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_TEAM_PORT],
-		.properties                         = property_infos_team_port,
-		.properties_num                     = G_N_ELEMENTS (property_infos_team_port),
-	},
-	[NM_META_SETTING_TYPE_TUN] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_TUN],
-		.properties                         = property_infos_tun,
-		.properties_num                     = G_N_ELEMENTS (property_infos_tun),
-	},
-	[NM_META_SETTING_TYPE_VLAN] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_VLAN],
-		.properties                         = property_infos_vlan,
-		.properties_num                     = G_N_ELEMENTS (property_infos_vlan),
-	},
-	[NM_META_SETTING_TYPE_VPN] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_VPN],
-		.properties                         = property_infos_vpn,
-		.properties_num                     = G_N_ELEMENTS (property_infos_vpn),
-	},
-	[NM_META_SETTING_TYPE_VXLAN] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_VXLAN],
-		.properties                         = property_infos_vxlan,
-		.properties_num                     = G_N_ELEMENTS (property_infos_vxlan),
-	},
-	[NM_META_SETTING_TYPE_WIMAX] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_WIMAX],
-		.properties                         = property_infos_wimax,
-		.properties_num                     = G_N_ELEMENTS (property_infos_wimax),
-	},
-	[NM_META_SETTING_TYPE_WIRED] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_WIRED],
-		.properties                         = property_infos_wired,
-		.properties_num                     = G_N_ELEMENTS (property_infos_wired),
-	},
-	[NM_META_SETTING_TYPE_WIRELESS] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_WIRELESS],
-		.properties                         = property_infos_wireless,
-		.properties_num                     = G_N_ELEMENTS (property_infos_wireless),
-	},
-	[NM_META_SETTING_TYPE_WIRELESS_SECURITY] = {
-		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_WIRELESS_SECURITY],
-		.properties                         = property_infos_wireless_security,
-		.properties_num                     = G_N_ELEMENTS (property_infos_wireless_security),
-	},
-};
diff --git a/clients/cli/settings.h b/clients/cli/settings.h
index 485a961e92..7b99f8598d 100644
--- a/clients/cli/settings.h
+++ b/clients/cli/settings.h
@@ -20,106 +20,14 @@
 #ifndef NMC_SETTINGS_H
 #define NMC_SETTINGS_H
 
-#include "nm-setting-metadata.h"
+#include "nm-meta-setting.h"
+#include "nm-meta-setting-desc.h"
 
 #include "nmcli.h"
 #include "utils.h"
 
 /*****************************************************************************/
 
-typedef enum {
-	NM_META_ACCESSOR_GET_TYPE_PRETTY,
-	NM_META_ACCESSOR_GET_TYPE_PARSABLE,
-} NMMetaAccessorGetType;
-
-typedef enum {
-	NM_META_PROPERTY_TYPE_MAC_MODE_DEFAULT,
-	NM_META_PROPERTY_TYPE_MAC_MODE_CLONED,
-	NM_META_PROPERTY_TYPE_MAC_MODE_INFINIBAND,
-} NMMetaPropertyTypeMacMode;
-
-typedef struct _NMMetaSettingInfoEditor     NMMetaSettingInfoEditor;
-typedef struct _NMMetaPropertyInfo    NMMetaPropertyInfo;
-typedef struct _NMMetaPropertyType    NMMetaPropertyType;
-typedef struct _NMMetaPropertyTypData NMMetaPropertyTypData;
-
-struct _NMMetaPropertyType {
-
-	const char *(*describe_fcn) (const NMMetaSettingInfoEditor *setting_info,
-	                             const NMMetaPropertyInfo *property_info,
-	                             char **out_to_free);
-
-	char *(*get_fcn) (const NMMetaSettingInfoEditor *setting_info,
-	                  const NMMetaPropertyInfo *property_info,
-	                  NMSetting *setting,
-	                  NMMetaAccessorGetType get_type,
-	                  gboolean show_secrets);
-	gboolean (*set_fcn) (const NMMetaSettingInfoEditor *setting_info,
-	                     const NMMetaPropertyInfo *property_info,
-	                     NMSetting *setting,
-	                     const char *value,
-	                     GError **error);
-	gboolean (*remove_fcn) (const NMMetaSettingInfoEditor *setting_info,
-	                        const NMMetaPropertyInfo *property_info,
-	                        NMSetting *setting,
-	                        const char *option,
-	                        guint32 idx,
-	                        GError **error);
-
-	const char *const*(*values_fcn) (const NMMetaSettingInfoEditor *setting_info,
-	                                 const NMMetaPropertyInfo *property_info,
-	                                 char ***out_to_free);
-};
-
-struct _NMMetaPropertyTypData {
-	union {
-		struct {
-			gboolean (*fcn) (NMSetting *setting);
-		} get_with_default;
-		struct {
-			GType (*get_gtype) (void);
-			int min;
-			int max;
-		} gobject_enum;
-		struct {
-			guint32 (*get_fcn) (NMSetting *setting);
-		} mtu;
-		struct {
-			NMMetaPropertyTypeMacMode mode;
-		} mac;
-	} subtype;
-	const char *const*values_static;
-};
-
-struct _NMMetaPropertyInfo {
-	const char *property_name;
-
-	/* the property list for now must contain as first field the
-	 * "name", which isn't a regular property. This is required by
-	 * NmcOutputField and this first field is ignored for the
-	 * group_list/setting_info. */
-	bool is_name:1;
-
-	bool is_secret:1;
-
-	const char *describe_message;
-
-	const NMMetaPropertyType    *property_type;
-	const NMMetaPropertyTypData *property_typ_data;
-};
-
-struct _NMMetaSettingInfoEditor {
-	const NMMetaSettingInfo *general;
-	/* the order of the properties matter. The first *must* be the
-	 * "name", and then the order is as they are listed by default. */
-	const NMMetaPropertyInfo *properties;
-	guint properties_num;
-};
-
-extern const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[_NM_META_SETTING_TYPE_NUM];
-
-/*****************************************************************************/
-
 NMSetting *nmc_setting_new_for_name (const char *name);
 void nmc_setting_custom_init (NMSetting *setting);
 void nmc_setting_ip4_connect_handlers (NMSettingIPConfig *setting);
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
new file mode 100644
index 0000000000..1b64188fe9
--- /dev/null
+++ b/clients/common/nm-meta-setting-desc.c
@@ -0,0 +1,6108 @@
+/* nmcli - command-line tool to control NetworkManager
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2010 - 2017 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include "nm-meta-setting-desc.h"
+
+#include <stdlib.h>
+#include <arpa/inet.h>
+
+#include "nm-common-macros.h"
+#include "nm-vpn-helpers.h"
+
+/* FIXME: don't include headers from nmcli */
+#include "utils.h"
+#include "common.h"
+
+/*****************************************************************************/
+
+static gboolean validate_int (NMSetting *setting, const char* prop, gint val, GError **error);
+static gboolean validate_uint (NMSetting *setting, const char* prop, guint val, GError **error);
+static gboolean validate_int64 (NMSetting *setting, const char* prop, gint64 val, GError **error);
+static char *secret_flags_to_string (guint32 flags, NMMetaAccessorGetType get_type);
+
+#define ALL_SECRET_FLAGS \
+	(NM_SETTING_SECRET_FLAG_NONE | \
+	 NM_SETTING_SECRET_FLAG_AGENT_OWNED | \
+	 NM_SETTING_SECRET_FLAG_NOT_SAVED | \
+	 NM_SETTING_SECRET_FLAG_NOT_REQUIRED)
+
+/*****************************************************************************/
+
+#define ARGS_DESCRIBE_FCN \
+	const NMMetaSettingInfoEditor *setting_info, const NMMetaPropertyInfo *property_info, char **out_to_free
+
+#define ARGS_GET_FCN \
+	const NMMetaSettingInfoEditor *setting_info, const NMMetaPropertyInfo *property_info, NMSetting *setting, NMMetaAccessorGetType get_type, gboolean show_secrets
+
+#define ARGS_SET_FCN \
+	const NMMetaSettingInfoEditor *setting_info, const NMMetaPropertyInfo *property_info, NMSetting *setting, const char *value, GError **error
+
+#define ARGS_REMOVE_FCN \
+	const NMMetaSettingInfoEditor *setting_info, const NMMetaPropertyInfo *property_info, NMSetting *setting, const char *value, guint32 idx, GError **error
+
+#define ARGS_VALUES_FCN \
+	const NMMetaSettingInfoEditor *setting_info, const NMMetaPropertyInfo *property_info, char ***out_to_free
+
+static char *
+_get_fcn_name (ARGS_GET_FCN)
+{
+	nm_assert (nm_streq0 (nm_setting_get_name (setting), setting_info->general->setting_name));
+	return g_strdup (setting_info->general->setting_name);
+}
+
+static char *
+_get_fcn_nmc_with_default (ARGS_GET_FCN)
+{
+	const char *s;
+	char *s_full;
+	GValue val = G_VALUE_INIT;
+
+	if (property_info->property_typ_data->subtype.get_with_default.fcn (setting)) {
+		if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
+			return g_strdup ("");
+		return g_strdup (_("(default)"));
+	}
+
+	g_value_init (&val, G_TYPE_STRING);
+	g_object_get_property (G_OBJECT (setting), property_info->property_name, &val);
+	s = g_value_get_string (&val);
+	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
+		s_full = g_strdup (s && *s ? s : " ");
+	else
+		s_full = s ? g_strdup_printf ("\"%s\"", s) : g_strdup ("");
+	g_value_unset (&val);
+	return s_full;
+}
+
+static char *
+_get_fcn_gobject (ARGS_GET_FCN)
+{
+	char *s;
+	GValue val = G_VALUE_INIT;
+
+	g_value_init (&val, G_TYPE_STRING);
+	g_object_get_property (G_OBJECT (setting), property_info->property_name, &val);
+	s = g_value_dup_string (&val);
+	g_value_unset (&val);
+	return s;
+}
+
+static char *
+_get_fcn_gobject_mtu (ARGS_GET_FCN)
+{
+	guint32 mtu;
+
+	if (   !property_info->property_typ_data
+	    || !property_info->property_typ_data->subtype.mtu.get_fcn)
+		return _get_fcn_gobject (setting_info, property_info, setting, get_type, show_secrets);
+
+	mtu = property_info->property_typ_data->subtype.mtu.get_fcn (setting);
+	if (mtu == 0) {
+		if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
+			return g_strdup ("auto");
+		else
+			return g_strdup (_("auto"));
+	}
+	return g_strdup_printf ("%u", (unsigned) mtu);
+}
+
+static char *
+_get_fcn_gobject_secret_flags (ARGS_GET_FCN)
+{
+	guint v;
+	GValue val = G_VALUE_INIT;
+
+	g_value_init (&val, G_TYPE_UINT);
+	g_object_get_property (G_OBJECT (setting), property_info->property_name, &val);
+	v = g_value_get_uint (&val);
+	g_value_unset (&val);
+	return secret_flags_to_string (v, get_type);
+}
+
+/*****************************************************************************/
+
+static gboolean
+_set_fcn_gobject_string (ARGS_SET_FCN)
+{
+	if (   property_info->property_typ_data
+	    && property_info->property_typ_data->values_static) {
+		value = nmc_string_is_valid (value,
+		                             (const char **) property_info->property_typ_data->values_static,
+		                             error);
+		if (!value)
+			return FALSE;
+	}
+	g_object_set (setting, property_info->property_name, value, NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_gobject_bool (ARGS_SET_FCN)
+{
+	gboolean val_bool;
+
+	if (!nmc_string_to_bool (value, &val_bool, error))
+		return FALSE;
+
+	g_object_set (setting, property_info->property_name, val_bool, NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_gobject_trilean (ARGS_SET_FCN)
+{
+	long int val_int;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!nmc_string_to_int (value, TRUE, -1, 1, &val_int)) {
+		g_set_error (error, 1, 0, _("'%s' is not a valid value; use -1, 0 or 1"), value);
+		return FALSE;
+	}
+
+	g_object_set (setting, property_info->property_name, val_int, NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_gobject_int (ARGS_SET_FCN)
+{
+	long int val_int;
+
+	if (!nmc_string_to_int (value, TRUE, G_MININT, G_MAXINT, &val_int)) {
+		g_set_error (error, 1, 0, _("'%s' is not a valid number (or out of range)"), value);
+		return FALSE;
+	}
+
+	/* Validate the number according to the property spec */
+	if (!validate_int (setting, property_info->property_name, (gint) val_int, error))
+		return FALSE;
+
+	g_object_set (setting, property_info->property_name, (gint) val_int, NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_gobject_int64 (ARGS_SET_FCN)
+{
+	long val_int;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!nmc_string_to_int (value, FALSE, 0, 0, &val_int)) {
+		g_set_error (error, 1, 0, _("'%s' is not a valid number (or out of range)"), value);
+		return FALSE;
+	}
+
+	/* Validate the number according to the property spec */
+	if (!validate_int64 (setting, property_info->property_name, (gint64) val_int, error))
+		return FALSE;
+
+	g_object_set (setting, property_info->property_name, (gint64) val_int, NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_gobject_uint (ARGS_SET_FCN)
+{
+	unsigned long val_int;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!nmc_string_to_uint (value, TRUE, 0, G_MAXUINT, &val_int)) {
+		g_set_error (error, 1, 0, _("'%s' is not a valid number (or out of range)"), value);
+		return FALSE;
+	}
+
+	/* Validate the number according to the property spec */
+	if (!validate_uint (setting, property_info->property_name, (guint) val_int, error))
+		return FALSE;
+
+	g_object_set (setting, property_info->property_name, (guint) val_int, NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_gobject_mtu (ARGS_SET_FCN)
+{
+	if (nm_streq0 (value, "auto"))
+		value = "0";
+	return _set_fcn_gobject_uint (setting_info, property_info, setting, value, error);
+}
+
+static gboolean
+_set_fcn_gobject_mac (ARGS_SET_FCN)
+{
+	NMMetaPropertyTypeMacMode mode;
+	gboolean valid;
+
+	if (property_info->property_typ_data)
+		mode = property_info->property_typ_data->subtype.mac.mode;
+	else
+		mode = NM_META_PROPERTY_TYPE_MAC_MODE_DEFAULT;
+
+
+	if (mode == NM_META_PROPERTY_TYPE_MAC_MODE_INFINIBAND)
+		valid = nm_utils_hwaddr_valid (value, INFINIBAND_ALEN);
+	else {
+		valid =    nm_utils_hwaddr_valid (value, ETH_ALEN)
+		        || (   mode == NM_META_PROPERTY_TYPE_MAC_MODE_CLONED
+		            && NM_CLONED_MAC_IS_SPECIAL (value));
+	}
+
+	if (!valid) {
+		g_set_error (error, 1, 0, _("'%s' is not a valid Ethernet MAC"), value);
+		return FALSE;
+	}
+
+	g_object_set (setting, property_info->property_name, value, NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_gobject_secret_flags (ARGS_SET_FCN)
+{
+	char **strv = NULL, **iter;
+	unsigned long flags = 0, val_int;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	strv = nmc_strsplit_set (value, " \t,", 0);
+	for (iter = strv; iter && *iter; iter++) {
+		if (!nmc_string_to_uint (*iter, TRUE, 0, ALL_SECRET_FLAGS, &val_int)) {
+			g_set_error (error, 1, 0, _("'%s' is not a valid flag number; use <0-%d>"),
+			             *iter, ALL_SECRET_FLAGS);
+			g_strfreev (strv);
+			return FALSE;
+		}
+		flags += val_int;
+	}
+	g_strfreev (strv);
+
+	/* Validate the flags number */
+	if (flags > ALL_SECRET_FLAGS) {
+		flags = ALL_SECRET_FLAGS;
+		g_print (_("Warning: '%s' sum is higher than all flags => all flags set\n"), value);
+	}
+
+	g_object_set (setting, property_info->property_name, (guint) flags, NULL);
+	return TRUE;
+}
+
+/*****************************************************************************/
+
+static const char *const*
+_values_fcn_gobject_enum (ARGS_VALUES_FCN)
+{
+	char **v, **w;
+	bool has_minmax =    property_info->property_typ_data->subtype.gobject_enum.min
+	                  || property_info->property_typ_data->subtype.gobject_enum.max;
+
+	v = (char **) nm_utils_enum_get_values (             property_info->property_typ_data->subtype.gobject_enum.get_gtype (),
+	                                        has_minmax ? property_info->property_typ_data->subtype.gobject_enum.min : G_MININT,
+	                                        has_minmax ? property_info->property_typ_data->subtype.gobject_enum.max : G_MAXINT);
+	for (w = v; w && *w; w++)
+		*w = g_strdup (*w);
+	return (const char *const*) (*out_to_free = v);
+}
+
+/*****************************************************************************/
+
+static char *
+wep_key_type_to_string (NMWepKeyType type)
+{
+	switch (type) {
+	case NM_WEP_KEY_TYPE_KEY:
+		return g_strdup_printf (_("%d (key)"), type);
+	case NM_WEP_KEY_TYPE_PASSPHRASE:
+		return g_strdup_printf (_("%d (passphrase)"), type);
+	case NM_WEP_KEY_TYPE_UNKNOWN:
+	default:
+		return g_strdup_printf (_("%d (unknown)"), type);
+	}
+}
+
+static char *
+bytes_to_string (GBytes *bytes)
+{
+	const guint8 *data;
+	gsize len;
+	GString *cert = NULL;
+	int i;
+
+	if (!bytes)
+		return NULL;
+	data = g_bytes_get_data (bytes, &len);
+
+	cert = g_string_new (NULL);
+	for (i = 0; i < len; i++)
+		g_string_append_printf (cert, "%02X", data[i]);
+
+	return g_string_free (cert, FALSE);
+}
+
+static char *
+vlan_flags_to_string (guint32 flags, NMMetaAccessorGetType get_type)
+{
+	GString *flag_str;
+
+	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
+		return g_strdup_printf ("%u", flags);
+
+	if (flags == 0)
+		return g_strdup (_("0 (NONE)"));
+
+	flag_str = g_string_new (NULL);
+	g_string_printf (flag_str, "%d (", flags);
+
+	if (flags & NM_VLAN_FLAG_REORDER_HEADERS)
+		g_string_append (flag_str, _("REORDER_HEADERS, "));
+	if (flags & NM_VLAN_FLAG_GVRP)
+		g_string_append (flag_str, _("GVRP, "));
+	if (flags & NM_VLAN_FLAG_LOOSE_BINDING)
+		g_string_append (flag_str, _("LOOSE_BINDING, "));
+	if (flags & NM_VLAN_FLAG_MVRP)
+		g_string_append (flag_str, _("MVRP, "));
+
+	if (flag_str->str[flag_str->len-1] == '(')
+		g_string_append (flag_str, _("unknown"));
+	else
+		g_string_truncate (flag_str, flag_str->len-2);  /* chop off trailing ', ' */
+
+	g_string_append_c (flag_str, ')');
+
+	return g_string_free (flag_str, FALSE);
+}
+
+static char *
+vlan_priorities_to_string (NMSettingVlan *s_vlan, NMVlanPriorityMap map)
+{
+	GString *priorities;
+	int i;
+
+	priorities = g_string_new (NULL);
+	for (i = 0; i < nm_setting_vlan_get_num_priorities (s_vlan, map); i++) {
+		guint32 from, to;
+
+		if (nm_setting_vlan_get_priority (s_vlan, map, i, &from, &to))
+			g_string_append_printf (priorities, "%d:%d,", from, to);
+	}
+	if (priorities->len)
+		g_string_truncate (priorities, priorities->len-1);  /* chop off trailing ',' */
+
+	return g_string_free (priorities, FALSE);
+}
+
+static char *
+ip6_privacy_to_string (NMSettingIP6ConfigPrivacy ip6_privacy, NMMetaAccessorGetType get_type)
+{
+	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
+		return g_strdup_printf ("%d", ip6_privacy);
+
+	switch (ip6_privacy) {
+	case NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED:
+		return g_strdup_printf (_("%d (disabled)"), ip6_privacy);
+	case NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR:
+		return g_strdup_printf (_("%d (enabled, prefer public IP)"), ip6_privacy);
+	case NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR:
+		return g_strdup_printf (_("%d (enabled, prefer temporary IP)"), ip6_privacy);
+	default:
+		return g_strdup_printf (_("%d (unknown)"), ip6_privacy);
+	}
+}
+
+static char *
+autoconnect_slaves_to_string (NMSettingConnectionAutoconnectSlaves autoconnect_slaves,
+                              NMMetaAccessorGetType get_type)
+{
+	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
+		return g_strdup_printf ("%d", autoconnect_slaves);
+
+	switch (autoconnect_slaves) {
+	case NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO:
+		return g_strdup_printf (_("%d (no)"), autoconnect_slaves);
+	case NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES:
+		return g_strdup_printf (_("%d (yes)"), autoconnect_slaves);
+	case NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT:
+	default:
+		return g_strdup_printf (_("%d (default)"), autoconnect_slaves);
+	}
+}
+
+static char *
+secret_flags_to_string (guint32 flags, NMMetaAccessorGetType get_type)
+{
+	GString *flag_str;
+
+	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
+		return g_strdup_printf ("%u", flags);
+
+	if (flags == 0)
+		return g_strdup (_("0 (none)"));
+
+	flag_str = g_string_new (NULL);
+	g_string_printf (flag_str, "%u (", flags);
+
+	if (flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED)
+		g_string_append (flag_str, _("agent-owned, "));
+	if (flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)
+		g_string_append (flag_str, _("not saved, "));
+	if (flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED)
+		g_string_append (flag_str, _("not required, "));
+
+	if (flag_str->str[flag_str->len-1] == '(')
+		g_string_append (flag_str, _("unknown"));
+	else
+		g_string_truncate (flag_str, flag_str->len-2);  /* chop off trailing ', ' */
+
+	g_string_append_c (flag_str, ')');
+
+	return g_string_free (flag_str, FALSE);
+}
+
+static void
+vpn_data_item (const char *key, const char *value, gpointer user_data)
+{
+	GString *ret_str = (GString *) user_data;
+
+	if (ret_str->len != 0)
+		g_string_append (ret_str, ", ");
+
+	g_string_append_printf (ret_str, "%s = %s", key, value);
+}
+
+#define DEFINE_SETTER_STR_LIST_MULTI(def_func, s_macro, set_func) \
+	static gboolean \
+	def_func (NMSetting *setting, \
+	          const char *prop, \
+	          const char *value, \
+	          const char **valid_strv, \
+	          GError **error) \
+	{ \
+		char **strv = NULL, **iter; \
+		const char *item; \
+		g_return_val_if_fail (error == NULL || *error == NULL, FALSE); \
+		strv = nmc_strsplit_set (value, " \t,", 0); \
+		for (iter = strv; iter && *iter; iter++) { \
+			if (!(item = nmc_string_is_valid (g_strstrip (*iter), valid_strv, error))) { \
+				g_strfreev (strv); \
+				return FALSE; \
+			} \
+			set_func (s_macro (setting), item); \
+		} \
+		g_strfreev (strv); \
+		return TRUE; \
+	}
+
+#define DEFINE_SETTER_OPTIONS(def_func, s_macro, s_type, add_func, valid_func1, valid_func2) \
+	static gboolean \
+	def_func (ARGS_SET_FCN) \
+	{ \
+		char **strv = NULL, **iter; \
+		const char **(*valid_func1_p) (s_type *) = valid_func1; \
+		const char * (*valid_func2_p) (const char *, const char *, GError **) = valid_func2; \
+		const char *opt_name, *opt_val; \
+		\
+		g_return_val_if_fail (error == NULL || *error == NULL, FALSE); \
+		\
+		strv = nmc_strsplit_set (value, ",", 0); \
+		for (iter = strv; iter && *iter; iter++) { \
+			char *left = g_strstrip (*iter); \
+			char *right = strchr (left, '='); \
+			if (!right) { \
+				g_set_error (error, 1, 0, _("'%s' is not valid; use <option>=<value>"), *iter); \
+				g_strfreev (strv); \
+				return FALSE; \
+			} \
+			*right++ = '\0'; \
+			\
+			if (valid_func1_p) { \
+				const char **valid_options = valid_func1_p (s_macro (setting)); \
+				if (!(opt_name = nmc_string_is_valid (g_strstrip (left), valid_options, error))) { \
+					g_strfreev (strv); \
+					return FALSE; \
+				} \
+			} else \
+				opt_name = g_strstrip (left);\
+			\
+			opt_val = g_strstrip (right); \
+			if (valid_func2_p) { \
+				if (!(opt_val = valid_func2_p ((const char *) left, (const char *) opt_val, error))) { \
+					g_strfreev (strv); \
+					return FALSE; \
+				}\
+			}\
+			add_func (s_macro (setting), opt_name, opt_val); \
+		} \
+		g_strfreev (strv); \
+		return TRUE; \
+	}
+
+#define DEFINE_REMOVER_INDEX_OR_VALUE(def_func, s_macro, num_func, rem_func_idx, rem_func_val) \
+	static gboolean \
+	def_func (ARGS_REMOVE_FCN) \
+	{ \
+		guint32 num; \
+		if (value) { \
+			gboolean ret; \
+			char *value_stripped = g_strstrip (g_strdup (value)); \
+			ret = rem_func_val (s_macro (setting), value_stripped, error); \
+			g_free (value_stripped); \
+			return ret; \
+		} \
+		num = num_func (s_macro (setting)); \
+		if (num == 0) { \
+			g_set_error_literal (error, 1, 0, _("no item to remove")); \
+			return FALSE; \
+		} \
+		if (idx >= num) { \
+			g_set_error (error, 1, 0, _("index '%d' is not in range <0-%d>"), idx, num - 1); \
+			return FALSE; \
+		} \
+		rem_func_idx (s_macro (setting), idx); \
+		return TRUE; \
+	}
+
+#define DEFINE_REMOVER_OPTION(def_func, s_macro, rem_func) \
+	static gboolean \
+	def_func (ARGS_REMOVE_FCN) \
+	{ \
+		gboolean success = FALSE; \
+		if (value && *value) { \
+			success = rem_func (s_macro (setting), value); \
+			if (!success) \
+				g_set_error (error, 1, 0, _("invalid option '%s'"), value); \
+		} else \
+			g_set_error_literal (error, 1, 0, _("missing option")); \
+		return success; \
+	}
+
+#define DEFINE_ALLOWED_VAL_FUNC(def_func, valid_values) \
+	static const char *const* \
+	def_func (NMSetting *setting, const char *prop) \
+	{ \
+		return valid_values; \
+	}
+
+#define DEFINE_SETTER_MAC_BLACKLIST(def_func, s_macro, add_func) \
+	static gboolean \
+	def_func (ARGS_SET_FCN) \
+	{ \
+		guint8 buf[32]; \
+		char **list = NULL, **iter; \
+		GSList *macaddr_blacklist = NULL; \
+		\
+		g_return_val_if_fail (error == NULL || *error == NULL, FALSE); \
+		\
+		list = nmc_strsplit_set (value, " \t,", 0); \
+		for (iter = list; iter && *iter; iter++) { \
+			if (!nm_utils_hwaddr_aton (*iter, buf, ETH_ALEN)) { \
+				g_set_error (error, 1, 0, _("'%s' is not a valid MAC"), *iter); \
+				g_strfreev (list); \
+				g_slist_free (macaddr_blacklist); \
+				return FALSE; \
+			} \
+		} \
+		\
+		for (iter = list; iter && *iter; iter++) \
+			add_func (s_macro (setting), *iter); \
+		\
+		g_strfreev (list); \
+		return TRUE; \
+	}
+
+
+static gboolean
+verify_string_list (char **strv,
+                    const char *prop,
+                    gboolean (*validate_func) (const char *),
+                    GError **error)
+{
+	char **iter;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	for (iter = strv; iter && *iter; iter++) {
+		if (**iter == '\0')
+			continue;
+		if (validate_func) {
+			if (!validate_func (*iter)) {
+				g_set_error (error, 1, 0, _("'%s' is not valid"),
+				             *iter);
+				return FALSE;
+			}
+		}
+	}
+	return TRUE;
+}
+
+static gboolean
+validate_int (NMSetting *setting, const char* prop, gint val, GError **error)
+{
+	GParamSpec *pspec;
+	GValue value = G_VALUE_INIT;
+	gboolean success = TRUE;
+
+	g_value_init (&value, G_TYPE_INT);
+	g_value_set_int (&value, val);
+	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop);
+	g_assert (G_IS_PARAM_SPEC (pspec));
+	if (g_param_value_validate (pspec, &value)) {
+		GParamSpecInt *pspec_int = (GParamSpecInt *) pspec;
+		g_set_error (error, 1, 0, _("'%d' is not valid; use <%d-%d>"),
+		             val, pspec_int->minimum, pspec_int->maximum);
+		success = FALSE;
+	}
+	g_value_unset (&value);
+	return success;
+}
+
+static gboolean
+validate_int64 (NMSetting *setting, const char* prop, gint64 val, GError **error)
+{
+	GParamSpec *pspec;
+	GValue value = G_VALUE_INIT;
+	gboolean success = TRUE;
+
+	g_value_init (&value, G_TYPE_INT64);
+	g_value_set_int64 (&value, val);
+	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop);
+	g_assert (G_IS_PARAM_SPEC (pspec));
+	if (g_param_value_validate (pspec, &value)) {
+		GParamSpecInt64 *pspec_int = (GParamSpecInt64 *) pspec;
+		G_STATIC_ASSERT (sizeof (long long) >= sizeof (gint64));
+		g_set_error (error, 1, 0, _("'%lld' is not valid; use <%lld-%lld>"),
+		             (long long) val, (long long) pspec_int->minimum, (long long) pspec_int->maximum);
+		success = FALSE;
+	}
+	g_value_unset (&value);
+	return success;
+}
+
+static gboolean
+validate_uint (NMSetting *setting, const char* prop, guint val, GError **error)
+{
+	GParamSpec *pspec;
+	GValue value = G_VALUE_INIT;
+	gboolean success = TRUE;
+
+	g_value_init (&value, G_TYPE_UINT);
+	g_value_set_uint (&value, val);
+	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop);
+	g_assert (G_IS_PARAM_SPEC (pspec));
+	if (g_param_value_validate (pspec, &value)) {
+		GParamSpecUInt *pspec_uint = (GParamSpecUInt *) pspec;
+		g_set_error (error, 1, 0, _("'%u' is not valid; use <%u-%u>"),
+		             val, pspec_uint->minimum, pspec_uint->maximum);
+		success = FALSE;
+	}
+	g_value_unset (&value);
+	return success;
+}
+
+static char *
+flag_values_to_string (GFlagsValue *array, guint n)
+{
+	GString *str;
+	guint i;
+
+	str = g_string_new (NULL);
+	for (i = 0; i < n; i++)
+		g_string_append_printf (str, "%u, ", array[i].value);
+	if (str->len)
+		g_string_truncate (str, str->len-2);  /* chop off trailing ', ' */
+	return g_string_free (str, FALSE);
+}
+
+static gboolean
+validate_flags (NMSetting *setting, const char* prop, guint val, GError **error)
+{
+	GParamSpec *pspec;
+	GValue value = G_VALUE_INIT;
+	gboolean success = TRUE;
+
+	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop);
+	g_assert (G_IS_PARAM_SPEC (pspec));
+
+	g_value_init (&value, pspec->value_type);
+	g_value_set_flags (&value, val);
+
+	if (g_param_value_validate (pspec, &value)) {
+		GParamSpecFlags *pspec_flags = (GParamSpecFlags *) pspec;
+		char *flag_values = flag_values_to_string (pspec_flags->flags_class->values,
+		                                           pspec_flags->flags_class->n_values);
+		g_set_error (error, 1, 0, _("'%u' flags are not valid; use combination of %s"),
+		             val, flag_values);
+		g_free (flag_values);
+		success = FALSE;
+	}
+	g_value_unset (&value);
+	return success;
+}
+
+static gboolean
+check_and_set_string (NMSetting *setting,
+                      const char *prop,
+                      const char *val,
+                      const char **valid_strv,
+                      GError **error)
+{
+	const char *checked_val;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	checked_val = nmc_string_is_valid (val, valid_strv, error);
+	if (!checked_val)
+		return FALSE;
+
+	g_object_set (setting, prop, checked_val, NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_gobject_flags (ARGS_SET_FCN)
+{
+	unsigned long val_int;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!nmc_string_to_uint (value, TRUE, 0, G_MAXUINT, &val_int)) {
+		g_set_error (error, 1, 0, _("'%s' is not a valid number (or out of range)"), value);
+		return FALSE;
+	}
+
+	/* Validate the flags according to the property spec */
+	if (!validate_flags (setting, property_info->property_name, (guint) val_int, error))
+		return FALSE;
+
+	g_object_set (setting, property_info->property_name, (guint) val_int, NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_gobject_ssid (ARGS_SET_FCN)
+{
+	GBytes *ssid;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (strlen (value) > 32) {
+		g_set_error (error, 1, 0, _("'%s' is not valid"), value);
+		return FALSE;
+	}
+
+	ssid = g_bytes_new (value, strlen (value));
+	g_object_set (setting, property_info->property_name, ssid, NULL);
+	g_bytes_unref (ssid);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_gobject_ifname (ARGS_SET_FCN)
+{
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!nm_utils_is_valid_iface_name (value, error))
+		return FALSE;
+	g_object_set (setting, property_info->property_name, value, NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_vpn_service_type (ARGS_SET_FCN)
+{
+	gs_free char *service_name = NULL;
+
+	service_name = nm_vpn_plugin_info_list_find_service_type (nm_vpn_get_plugin_infos (), value);
+	g_object_set (setting, property_info->property_name, service_name ? : value, NULL);
+	return TRUE;
+}
+
+static gboolean
+nmc_util_is_domain (const char *domain)
+{
+	//FIXME: implement
+	return TRUE;
+}
+
+static gboolean
+nmc_property_set_byte_array (NMSetting *setting, const char *prop, const char *value, GError **error)
+{
+	char **strv = NULL, **iter;
+	char *val_strip;
+	const char *delimiters = " \t,";
+	long int val_int;
+	GBytes *bytes;
+	GByteArray *array = NULL;
+	gboolean success = TRUE;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	val_strip = g_strstrip (g_strdup (value));
+
+	/* First try hex string in the format of AAbbCCDd */
+	bytes = nm_utils_hexstr2bin (val_strip);
+	if (bytes) {
+		array = g_bytes_unref_to_array (bytes);
+		goto done;
+	}
+
+	/* Otherwise, consider the following format: AA b 0xCc D */
+	strv = nmc_strsplit_set (val_strip, delimiters, 0);
+	array = g_byte_array_sized_new (g_strv_length (strv));
+	for (iter = strv; iter && *iter; iter++) {
+		if (!nmc_string_to_int_base (g_strstrip (*iter), 16, TRUE, 0, 255, &val_int)) {
+			g_set_error (error, 1, 0, _("'%s' is not a valid hex character"), *iter);
+			success = FALSE;
+			goto done;
+		}
+		g_byte_array_append (array, (const guint8 *) &val_int, 1);
+	}
+
+done:
+	if (success)
+		g_object_set (setting, prop, array, NULL);
+
+	g_strfreev (strv);
+	if (array)
+		g_byte_array_free (array, TRUE);
+	return success;
+}
+
+/*****************************************************************************/
+
+static char *
+_get_fcn_802_1x_ca_cert (ARGS_GET_FCN)
+{
+	NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
+	char *ca_cert_str = NULL;
+
+	switch (nm_setting_802_1x_get_ca_cert_scheme (s_8021X)) {
+	case NM_SETTING_802_1X_CK_SCHEME_BLOB:
+		ca_cert_str = bytes_to_string (nm_setting_802_1x_get_ca_cert_blob (s_8021X));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_PATH:
+		ca_cert_str = g_strdup (nm_setting_802_1x_get_ca_cert_path (s_8021X));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
+		ca_cert_str = g_strdup (nm_setting_802_1x_get_ca_cert_uri (s_8021X));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
+		break;
+	}
+
+	return ca_cert_str;
+}
+
+static char *
+_get_fcn_802_1x_client_cert (ARGS_GET_FCN)
+{
+	NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
+	char *cert_str = NULL;
+
+	switch (nm_setting_802_1x_get_client_cert_scheme (s_8021X)) {
+	case NM_SETTING_802_1X_CK_SCHEME_BLOB:
+		if (show_secrets)
+			cert_str = bytes_to_string (nm_setting_802_1x_get_client_cert_blob (s_8021X));
+		else
+			cert_str = g_strdup (_(NM_META_TEXT_HIDDEN));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_PATH:
+		cert_str = g_strdup (nm_setting_802_1x_get_client_cert_path (s_8021X));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
+		cert_str = g_strdup (nm_setting_802_1x_get_client_cert_uri (s_8021X));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
+		break;
+	}
+
+	return cert_str;
+}
+
+static char *
+_get_fcn_802_1x_phase2_ca_cert (ARGS_GET_FCN)
+{
+	NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
+	char *phase2_ca_cert_str = NULL;
+
+	switch (nm_setting_802_1x_get_phase2_ca_cert_scheme (s_8021X)) {
+	case NM_SETTING_802_1X_CK_SCHEME_BLOB:
+		phase2_ca_cert_str = bytes_to_string (nm_setting_802_1x_get_phase2_ca_cert_blob (s_8021X));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_PATH:
+		phase2_ca_cert_str = g_strdup (nm_setting_802_1x_get_phase2_ca_cert_path (s_8021X));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
+		phase2_ca_cert_str = g_strdup (nm_setting_802_1x_get_phase2_ca_cert_uri (s_8021X));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
+		break;
+	}
+
+	return phase2_ca_cert_str;
+}
+
+static char *
+_get_fcn_802_1x_phase2_client_cert (ARGS_GET_FCN)
+{
+	NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
+	char *cert_str = NULL;
+
+	switch (nm_setting_802_1x_get_phase2_client_cert_scheme (s_8021X)) {
+	case NM_SETTING_802_1X_CK_SCHEME_BLOB:
+		if (show_secrets)
+			cert_str = bytes_to_string (nm_setting_802_1x_get_phase2_client_cert_blob (s_8021X));
+		else
+			cert_str = g_strdup (_(NM_META_TEXT_HIDDEN));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_PATH:
+		cert_str = g_strdup (nm_setting_802_1x_get_phase2_client_cert_path (s_8021X));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
+		cert_str = g_strdup (nm_setting_802_1x_get_phase2_client_cert_uri (s_8021X));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
+		break;
+	}
+
+	return cert_str;
+}
+
+static char *
+_get_fcn_802_1x_password_raw (ARGS_GET_FCN)
+{
+	NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
+	return bytes_to_string (nm_setting_802_1x_get_password_raw (s_8021X));
+}
+
+static char *
+_get_fcn_802_1x_private_key (ARGS_GET_FCN)
+{
+	NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
+	char *key_str = NULL;
+
+	switch (nm_setting_802_1x_get_private_key_scheme (s_8021X)) {
+	case NM_SETTING_802_1X_CK_SCHEME_BLOB:
+		if (show_secrets)
+			key_str = bytes_to_string (nm_setting_802_1x_get_private_key_blob (s_8021X));
+		else
+			key_str = g_strdup (_(NM_META_TEXT_HIDDEN));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_PATH:
+		key_str = g_strdup (nm_setting_802_1x_get_private_key_path (s_8021X));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
+		key_str = g_strdup (nm_setting_802_1x_get_private_key_uri (s_8021X));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
+		break;
+	}
+
+	return key_str;
+}
+
+static char *
+_get_fcn_802_1x_phase2_private_key (ARGS_GET_FCN)
+{
+	NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
+	char *key_str = NULL;
+
+	switch (nm_setting_802_1x_get_phase2_private_key_scheme (s_8021X)) {
+	case NM_SETTING_802_1X_CK_SCHEME_BLOB:
+		if (show_secrets)
+			key_str = bytes_to_string (nm_setting_802_1x_get_phase2_private_key_blob (s_8021X));
+		else
+			key_str = g_strdup (_(NM_META_TEXT_HIDDEN));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_PATH:
+		key_str = g_strdup (nm_setting_802_1x_get_phase2_private_key_path (s_8021X));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
+		key_str = g_strdup (nm_setting_802_1x_get_phase2_private_key_uri (s_8021X));
+		break;
+	case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
+		break;
+	}
+
+	return key_str;
+}
+
+#define DEFINE_SETTER_STR_LIST(def_func, set_func) \
+	static gboolean \
+	def_func (ARGS_SET_FCN) \
+	{ \
+		char **strv = NULL; \
+		guint i = 0; \
+		\
+		g_return_val_if_fail (error == NULL || *error == NULL, FALSE); \
+		\
+		strv = nmc_strsplit_set (value, " \t,", 0); \
+		while (strv && strv[i]) \
+			set_func (NM_SETTING_802_1X (setting), strv[i++]); \
+		g_strfreev (strv); \
+		return TRUE; \
+	}
+
+#define DEFINE_SETTER_CERT(def_func, set_func) \
+	static gboolean \
+	def_func (ARGS_SET_FCN) \
+	{ \
+		char *val_strip = g_strstrip (g_strdup (value)); \
+		char *p = val_strip; \
+		NMSetting8021xCKScheme scheme = NM_SETTING_802_1X_CK_SCHEME_PATH; \
+		gboolean success; \
+		\
+		if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11, NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11)) == 0) \
+			scheme = NM_SETTING_802_1X_CK_SCHEME_PKCS11; \
+		else if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) == 0) \
+			p += NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH); \
+		\
+		success = set_func (NM_SETTING_802_1X (setting), p, scheme, NULL, error); \
+		g_free (val_strip); \
+		return success; \
+	}
+
+#define DEFINE_SETTER_PRIV_KEY(def_func, pwd_func, set_func) \
+	static gboolean \
+	def_func (ARGS_SET_FCN) \
+	{ \
+		char **strv = NULL; \
+		char *val_strip = g_strstrip (g_strdup (value)); \
+		char *p = val_strip; \
+		const char *path, *password; \
+		gs_free char *password_free = NULL; \
+		NMSetting8021xCKScheme scheme = NM_SETTING_802_1X_CK_SCHEME_PATH; \
+		gboolean success; \
+		\
+		if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11, NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11)) == 0) \
+			scheme = NM_SETTING_802_1X_CK_SCHEME_PKCS11; \
+		else if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) == 0) \
+			p += NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH); \
+		\
+		strv = nmc_strsplit_set (p, " \t,", 2); \
+		path = strv[0]; \
+		if (g_strv_length (strv) == 2) \
+			password = strv[1]; \
+		else \
+			password = password_free = g_strdup (pwd_func (NM_SETTING_802_1X (setting))); \
+		success = set_func (NM_SETTING_802_1X (setting), path, password, scheme, NULL, error); \
+		g_free (val_strip); \
+		g_strfreev (strv); \
+		return success; \
+	}
+
+static gboolean
+_validate_and_remove_eap_method (NMSetting8021x *setting,
+                                 const char *eap,
+                                 GError **error)
+{
+	gboolean ret;
+
+	ret = nm_setting_802_1x_remove_eap_method_by_value(setting, eap);
+	if (!ret)
+		g_set_error (error, 1, 0, _("the property doesn't contain EAP method '%s'"), eap);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_802_1x_eap,
+                               NM_SETTING_802_1X,
+                               nm_setting_802_1x_get_num_eap_methods,
+                               nm_setting_802_1x_remove_eap_method,
+                               _validate_and_remove_eap_method)
+
+DEFINE_SETTER_CERT (_set_fcn_802_1x_ca_cert, nm_setting_802_1x_set_ca_cert)
+
+DEFINE_SETTER_STR_LIST (_set_fcn_802_1x_altsubject_matches, nm_setting_802_1x_add_altsubject_match)
+
+static gboolean
+_validate_and_remove_altsubject_match (NMSetting8021x *setting,
+                                       const char *altsubject_match,
+                                       GError **error)
+{
+	gboolean ret;
+
+	ret = nm_setting_802_1x_remove_altsubject_match_by_value (setting, altsubject_match);
+	if (!ret)
+		g_set_error (error, 1, 0,
+		             _("the property doesn't contain alternative subject match '%s'"),
+		             altsubject_match);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_802_1x_altsubject_matches,
+                               NM_SETTING_802_1X,
+                               nm_setting_802_1x_get_num_altsubject_matches,
+                               nm_setting_802_1x_remove_altsubject_match,
+                               _validate_and_remove_altsubject_match)
+
+DEFINE_SETTER_CERT (_set_fcn_802_1x_client_cert, nm_setting_802_1x_set_client_cert)
+
+DEFINE_SETTER_CERT (_set_fcn_802_1x_phase2_ca_cert, nm_setting_802_1x_set_phase2_ca_cert)
+
+DEFINE_SETTER_STR_LIST (_set_fcn_802_1x_phase2_altsubject_matches, nm_setting_802_1x_add_phase2_altsubject_match)
+
+static gboolean
+_validate_and_remove_phase2_altsubject_match (NMSetting8021x *setting,
+                                              const char *phase2_altsubject_match,
+                                              GError **error)
+{
+	gboolean ret;
+
+	ret = nm_setting_802_1x_remove_phase2_altsubject_match_by_value (setting, phase2_altsubject_match);
+	if (!ret)
+		g_set_error (error, 1, 0,
+		             _("the property doesn't contain \"phase2\" alternative subject match '%s'"),
+		             phase2_altsubject_match);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_802_1x_phase2_altsubject_matches,
+                               NM_SETTING_802_1X,
+                               nm_setting_802_1x_get_num_phase2_altsubject_matches,
+                               nm_setting_802_1x_remove_phase2_altsubject_match,
+                               _validate_and_remove_phase2_altsubject_match)
+
+DEFINE_SETTER_CERT (_set_fcn_802_1x_phase2_client_cert, nm_setting_802_1x_set_phase2_client_cert)
+
+DEFINE_SETTER_PRIV_KEY (_set_fcn_802_1x_private_key,
+                        nm_setting_802_1x_get_private_key_password,
+                        nm_setting_802_1x_set_private_key)
+
+DEFINE_SETTER_PRIV_KEY (_set_fcn_802_1x_phase2_private_key,
+                        nm_setting_802_1x_get_phase2_private_key_password,
+                        nm_setting_802_1x_set_phase2_private_key)
+
+static gboolean
+_set_fcn_802_1x_password_raw (ARGS_SET_FCN)
+{
+	return nmc_property_set_byte_array (setting, property_info->property_name, value, error);
+}
+
+static char *
+_get_fcn_802_1x_phase1_auth_flags (ARGS_GET_FCN)
+{
+	NMSetting8021x *s_8021x = NM_SETTING_802_1X (setting);
+	NMSetting8021xAuthFlags flags;
+	char *tmp, *str;
+
+	flags = nm_setting_802_1x_get_phase1_auth_flags (s_8021x);
+	tmp = nm_utils_enum_to_str (nm_setting_802_1x_auth_flags_get_type (), flags);
+	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
+		str = g_strdup_printf ("%s", tmp && *tmp ? tmp : "none");
+	else
+		str = g_strdup_printf ("%d (%s)", flags, tmp && *tmp ? tmp : "none");
+	g_free (tmp);
+	return str;
+}
+
+static gboolean
+_set_fcn_802_1x_phase1_auth_flags (ARGS_SET_FCN)
+{
+	NMSetting8021xAuthFlags flags;
+	gs_free char *err_token = NULL;
+	gboolean ret;
+	long int t;
+
+	if (nmc_string_to_int_base (value, 0, TRUE,
+	                            NM_SETTING_802_1X_AUTH_FLAGS_NONE,
+	                            NM_SETTING_802_1X_AUTH_FLAGS_ALL,
+	                            &t))
+		flags = (NMSetting8021xAuthFlags) t;
+	else {
+		ret = nm_utils_enum_from_str (nm_setting_802_1x_auth_flags_get_type (), value,
+		                              (int *) &flags, &err_token);
+
+		if (!ret) {
+			if (g_ascii_strcasecmp (err_token, "none") == 0)
+				flags = NM_SETTING_802_1X_AUTH_FLAGS_NONE;
+			else {
+				g_set_error (error, 1, 0, _("invalid option '%s', use a combination of [%s]"),
+				             err_token,
+				             nm_utils_enum_to_str (nm_setting_802_1x_auth_flags_get_type (),
+				                                   NM_SETTING_802_1X_AUTH_FLAGS_ALL));
+				return FALSE;
+			}
+		}
+	}
+
+	g_object_set (setting, property_info->property_name, (guint) flags, NULL);
+	return TRUE;
+}
+
+static char *
+_get_fcn_bond_options (ARGS_GET_FCN)
+{
+	NMSettingBond *s_bond = NM_SETTING_BOND (setting);
+	GString *bond_options_s;
+	int i;
+
+	bond_options_s = g_string_new (NULL);
+	for (i = 0; i < nm_setting_bond_get_num_options (s_bond); i++) {
+		const char *key, *value;
+		gs_free char *tmp_value = NULL;
+		char *p;
+
+		nm_setting_bond_get_option (s_bond, i, &key, &value);
+
+		if (nm_streq0 (key, NM_SETTING_BOND_OPTION_ARP_IP_TARGET)) {
+			value = tmp_value = g_strdup (value);
+			for (p = tmp_value; p && *p; p++) {
+				if (*p == ',')
+					*p = ' ';
+			}
+		}
+
+		g_string_append_printf (bond_options_s, "%s=%s,", key, value);
+	}
+	g_string_truncate (bond_options_s, bond_options_s->len-1);  /* chop off trailing ',' */
+
+	return g_string_free (bond_options_s, FALSE);
+}
+
+/*  example: miimon=100,mode=balance-rr, updelay=5 */
+static gboolean
+_validate_and_remove_bond_option (NMSettingBond *setting, const char *option)
+{
+	const char *opt;
+	const char **valid_options;
+
+	valid_options = nm_setting_bond_get_valid_options (setting);
+	opt = nmc_string_is_valid (option, valid_options, NULL);
+
+	if (opt)
+		return nm_setting_bond_remove_option (setting, opt);
+	else
+		return FALSE;
+}
+
+static const char *
+_validate_bond_option_value (const char *option, const char *value, GError **error)
+{
+	if (!g_strcmp0 (option, NM_SETTING_BOND_OPTION_MODE))
+		return nmc_bond_validate_mode (value, error);
+
+	return value;
+}
+
+static gboolean
+_bond_add_option (NMSettingBond *setting,
+                  const char *name,
+                  const char *value)
+{
+	gs_free char *tmp_value = NULL;
+	char *p;
+
+	if (nm_streq0 (name, NM_SETTING_BOND_OPTION_ARP_IP_TARGET)) {
+		value = tmp_value = g_strdup (value);
+		for (p = tmp_value; p && *p; p++)
+			if (*p == ' ')
+				*p = ',';
+	}
+
+	return nm_setting_bond_add_option (setting, name, value);
+}
+
+DEFINE_SETTER_OPTIONS (_set_fcn_bond_options,
+                       NM_SETTING_BOND,
+                       NMSettingBond,
+                       _bond_add_option,
+                       nm_setting_bond_get_valid_options,
+                       _validate_bond_option_value)
+DEFINE_REMOVER_OPTION (_remove_fcn_bond_options,
+                       NM_SETTING_BOND,
+                       _validate_and_remove_bond_option)
+
+static const char *
+_describe_fcn_bond_options (ARGS_DESCRIBE_FCN)
+{
+	gs_free char *options_str = NULL;
+	const char **valid_options;
+	char *s;
+
+	valid_options = nm_setting_bond_get_valid_options (NULL);
+	options_str = g_strjoinv (", ", (char **) valid_options);
+
+	s = g_strdup_printf (_("Enter a list of bonding options formatted as:\n"
+	                       "  option = <value>, option = <value>,... \n"
+	                       "Valid options are: %s\n"
+	                       "'mode' can be provided as a name or a number:\n"
+	                       "balance-rr    = 0\n"
+	                       "active-backup = 1\n"
+	                       "balance-xor   = 2\n"
+	                       "broadcast     = 3\n"
+	                       "802.3ad       = 4\n"
+	                       "balance-tlb   = 5\n"
+	                       "balance-alb   = 6\n\n"
+	                       "Example: mode=2,miimon=120\n"), options_str);
+	return (*out_to_free = s);
+}
+
+static const char *const*
+_values_fcn_bond_options (ARGS_VALUES_FCN)
+{
+	return nm_setting_bond_get_valid_options (NULL);
+}
+
+static char *
+_get_fcn_connection_autoconnect_retires (ARGS_GET_FCN)
+{
+	NMSettingConnection *s_con = NM_SETTING_CONNECTION (setting);
+	gint retries;
+
+	retries = nm_setting_connection_get_autoconnect_retries (s_con);
+	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
+		return g_strdup_printf ("%d", retries);
+
+	switch (retries) {
+	case -1:
+		return g_strdup_printf (_("%d (default)"), retries);
+	case 0:
+		return g_strdup_printf (_("%d (forever)"), retries);
+	default:
+		return g_strdup_printf ("%d", retries);
+	}
+}
+
+static char *
+_get_fcn_connection_permissions (ARGS_GET_FCN)
+{
+	NMSettingConnection *s_con = NM_SETTING_CONNECTION (setting);
+	GString *perm = NULL;
+	const char *perm_item;
+	const char *perm_type;
+	int i;
+
+	perm = g_string_new (NULL);
+	for (i = 0; i < nm_setting_connection_get_num_permissions (s_con); i++) {
+		if (nm_setting_connection_get_permission (s_con, i, &perm_type, &perm_item, NULL))
+			g_string_append_printf (perm, "%s:%s,", perm_type, perm_item);
+	}
+	if (perm->len > 0) {
+		g_string_truncate (perm, perm->len-1); /* remove trailing , */
+		return g_string_free (perm, FALSE);
+	}
+
+	/* No value from get_permission */
+	return g_string_free (perm, TRUE);
+}
+
+static char *
+_get_fcn_connection_autoconnect_slaves (ARGS_GET_FCN)
+{
+	NMSettingConnection *s_con = NM_SETTING_CONNECTION (setting);
+	return autoconnect_slaves_to_string (nm_setting_connection_get_autoconnect_slaves (s_con), get_type);
+}
+
+static gboolean
+_set_fcn_connection_type (ARGS_SET_FCN)
+{
+	gs_free char *uuid = NULL;
+
+	if (nm_setting_connection_get_uuid (NM_SETTING_CONNECTION (setting))) {
+		/* Don't allow setting type unless the connection is brand new.
+		 * Just because it's a bad idea and the user wouldn't probably want that.
+		 * No technical reason, really.
+		 * Also, using uuid to see if the connection is brand new is a bit
+		 * hacky: we can not see if the type is already set, because
+		 * nmc_setting_set_property() is called only after the property
+		 * we're setting (type) has been removed. */
+		g_set_error (error, 1, 0, _("Can not change the connection type"));
+		return FALSE;
+	}
+
+	uuid = nm_utils_uuid_generate ();
+	g_object_set (G_OBJECT (setting),
+	              NM_SETTING_CONNECTION_UUID, uuid,
+	              NULL);
+
+	g_object_set (G_OBJECT (setting), property_info->property_name, value, NULL);
+	return TRUE;
+}
+
+/* define from libnm-core/nm-setting-connection.c */
+#define PERM_USER_PREFIX  "user:"
+
+static gboolean
+permissions_valid (const char *perm)
+{
+	if (!perm || perm[0] == '\0')
+		return FALSE;
+
+	if (strncmp (perm, PERM_USER_PREFIX, strlen (PERM_USER_PREFIX)) == 0) {
+		if (   strlen (perm) <= strlen (PERM_USER_PREFIX)
+		    || strchr (perm + strlen (PERM_USER_PREFIX), ':'))
+			return  FALSE;
+	} else {
+		if (strchr (perm, ':'))
+			return  FALSE;
+	}
+
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_connection_permissions (ARGS_SET_FCN)
+{
+	char **strv = NULL;
+	guint i = 0;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	strv = nmc_strsplit_set (value, " \t,", 0);
+	if (!verify_string_list (strv, property_info->property_name, permissions_valid, error)) {
+		g_strfreev (strv);
+		return FALSE;
+	}
+
+	for (i = 0; strv && strv[i]; i++) {
+		const char *user;
+
+		if (strncmp (strv[i], PERM_USER_PREFIX, strlen (PERM_USER_PREFIX)) == 0)
+			user = strv[i]+strlen (PERM_USER_PREFIX);
+		else
+			user = strv[i];
+
+		nm_setting_connection_add_permission (NM_SETTING_CONNECTION (setting), "user", user, NULL);
+	}
+
+	return TRUE;
+}
+
+static gboolean
+_validate_and_remove_connection_permission (NMSettingConnection *setting,
+                                            const char *perm,
+                                            GError **error)
+{
+	gboolean ret;
+
+	ret = nm_setting_connection_remove_permission_by_value (setting, "user", perm, NULL);
+	if (!ret)
+		g_set_error (error, 1, 0, _("the property doesn't contain permission '%s'"), perm);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_connection_permissions,
+                               NM_SETTING_CONNECTION,
+                               nm_setting_connection_get_num_permissions,
+                               nm_setting_connection_remove_permission,
+                               _validate_and_remove_connection_permission)
+
+static gboolean
+_set_fcn_connection_master (ARGS_SET_FCN)
+{
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!value)
+		;
+	else if (!*value)
+		value = NULL;
+	else if (   !nm_utils_is_valid_iface_name (value, NULL)
+	         && !nm_utils_is_uuid (value)) {
+		g_set_error (error, 1, 0,
+		             _("'%s' is not valid master; use ifname or connection UUID"),
+		             value);
+		return FALSE;
+	}
+	g_object_set (setting, property_info->property_name, value, NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_connection_secondaries (ARGS_SET_FCN)
+{
+	const GPtrArray *connections;
+	NMConnection *con;
+	char **strv = NULL, **iter;
+	guint i = 0;
+
+	connections = nm_client_get_connections (nm_cli.client);
+	strv = nmc_strsplit_set (value, " \t,", 0);
+	for (iter = strv; iter && *iter; iter++) {
+		if (**iter == '\0')
+			continue;
+
+		if (nm_utils_is_uuid (*iter)) {
+			con = nmc_find_connection (connections, "uuid", *iter, NULL, FALSE);
+			if (!con)
+				g_print (_("Warning: %s is not an UUID of any existing connection profile\n"), *iter);
+			else {
+				/* Currenly NM only supports VPN connections as secondaries */
+				if (!nm_connection_is_type (con, NM_SETTING_VPN_SETTING_NAME)) {
+					g_set_error (error, 1, 0, _("'%s' is not a VPN connection profile"), *iter);
+					g_strfreev (strv);
+					return FALSE;
+				}
+			}
+		} else {
+			con = nmc_find_connection (connections, "id", *iter, NULL, FALSE);
+			if (!con) {
+				g_set_error (error, 1, 0, _("'%s' is not a name of any exiting profile"), *iter);
+				g_strfreev (strv);
+				return FALSE;
+			}
+
+			/* Currenly NM only supports VPN connections as secondaries */
+			if (!nm_connection_is_type (con, NM_SETTING_VPN_SETTING_NAME)) {
+				g_set_error (error, 1, 0, _("'%s' is not a VPN connection profile"), *iter);
+				g_strfreev (strv);
+				return FALSE;
+			}
+
+			/* translate id to uuid */
+			g_free (*iter);
+			*iter = g_strdup (nm_connection_get_uuid (con));
+		}
+	}
+
+	while (strv && strv[i])
+		nm_setting_connection_add_secondary (NM_SETTING_CONNECTION (setting), strv[i++]);
+	g_strfreev (strv);
+
+	return TRUE;
+}
+
+static gboolean
+_validate_and_remove_connection_secondary (NMSettingConnection *setting,
+                                           const char *secondary_uuid,
+                                           GError **error)
+{
+	gboolean ret;
+
+	if (!nm_utils_is_uuid (secondary_uuid)) {
+		g_set_error (error, 1, 0,
+		             _("the value '%s' is not a valid UUID"), secondary_uuid);
+		return FALSE;
+	}
+
+	ret = nm_setting_connection_remove_secondary_by_value (setting, secondary_uuid);
+	if (!ret)
+		g_set_error (error, 1, 0,
+		             _("the property doesn't contain UUID '%s'"), secondary_uuid);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_connection_secondaries,
+                               NM_SETTING_CONNECTION,
+                               nm_setting_connection_get_num_secondaries,
+                               nm_setting_connection_remove_secondary,
+                               _validate_and_remove_connection_secondary)
+
+static char *
+_get_fcn_connection_metered (ARGS_GET_FCN)
+{
+	NMSettingConnection *s_conn = NM_SETTING_CONNECTION (setting);
+
+	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE) {
+		switch (nm_setting_connection_get_metered (s_conn)) {
+		case NM_METERED_YES:
+			return g_strdup ("yes");
+		case NM_METERED_NO:
+			return g_strdup ("no");
+		case NM_METERED_UNKNOWN:
+		default:
+			return g_strdup ("unknown");
+		}
+	}
+	switch (nm_setting_connection_get_metered (s_conn)) {
+	case NM_METERED_YES:
+		return g_strdup (_("yes"));
+	case NM_METERED_NO:
+		return g_strdup (_("no"));
+	case NM_METERED_UNKNOWN:
+	default:
+		return g_strdup (_("unknown"));
+	}
+}
+
+static gboolean
+_set_fcn_connection_metered (ARGS_SET_FCN)
+{
+	NMMetered metered;
+	NMCTriStateValue ts_val;
+
+	if (!nmc_string_to_tristate (value, &ts_val, error))
+		return FALSE;
+
+	switch (ts_val) {
+	case NMC_TRI_STATE_YES:
+		metered = NM_METERED_YES;
+		break;
+	case NMC_TRI_STATE_NO:
+		metered = NM_METERED_NO;
+		break;
+	case NMC_TRI_STATE_UNKNOWN:
+		metered = NM_METERED_UNKNOWN;
+		break;
+	default:
+		g_assert_not_reached();
+	}
+
+	g_object_set (setting, property_info->property_name, metered, NULL);
+	return TRUE;
+}
+
+static char *
+_get_fcn_connection_lldp (ARGS_GET_FCN)
+{
+	NMSettingConnection *s_conn = NM_SETTING_CONNECTION (setting);
+	NMSettingConnectionLldp lldp;
+	char *tmp, *str;
+
+	lldp = nm_setting_connection_get_lldp (s_conn);
+	tmp = nm_utils_enum_to_str (nm_setting_connection_lldp_get_type (), lldp);
+	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
+		str = g_strdup_printf ("%s", tmp && *tmp ? tmp : "default");
+	else
+		str = g_strdup_printf ("%d (%s)", lldp, tmp && *tmp ? tmp : "default");
+	g_free (tmp);
+	return str;
+}
+
+static gboolean
+_set_fcn_connection_lldp (ARGS_SET_FCN)
+{
+	NMSettingConnectionLldp lldp;
+	gboolean ret;
+	long int t;
+
+	if (nmc_string_to_int_base (value, 0, TRUE,
+	                           NM_SETTING_CONNECTION_LLDP_DEFAULT,
+	                           NM_SETTING_CONNECTION_LLDP_ENABLE_RX,
+	                           &t))
+		lldp = t;
+	else {
+		ret = nm_utils_enum_from_str (nm_setting_connection_lldp_get_type (), value,
+		                              (int *) &lldp, NULL);
+
+		if (!ret) {
+			if (g_ascii_strcasecmp (value, "enable") == 0)
+				lldp = NM_SETTING_CONNECTION_LLDP_ENABLE_RX;
+			else {
+				g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
+				             value, "default,disable,enable-rx,enable");
+				return FALSE;
+			}
+		}
+	}
+
+	g_object_set (setting, property_info->property_name, lldp, NULL);
+	return TRUE;
+}
+
+static char *
+dcb_flags_to_string (NMSettingDcbFlags flags)
+{
+	GString *flag_str;
+
+	if (flags == 0)
+		return g_strdup (_("0 (disabled)"));
+
+	flag_str = g_string_new (NULL);
+	g_string_printf (flag_str, "%d (", flags);
+
+	if (flags & NM_SETTING_DCB_FLAG_ENABLE)
+		g_string_append (flag_str, _("enabled, "));
+	if (flags & NM_SETTING_DCB_FLAG_ADVERTISE)
+		g_string_append (flag_str, _("advertise, "));
+	if (flags & NM_SETTING_DCB_FLAG_WILLING)
+		g_string_append (flag_str, _("willing, "));
+
+	if (flag_str->str[flag_str->len-1] == '(')
+		g_string_append (flag_str, _("unknown"));
+	else
+		g_string_truncate (flag_str, flag_str->len-2);  /* chop off trailing ', ' */
+
+	g_string_append_c (flag_str, ')');
+
+	return g_string_free (flag_str, FALSE);
+}
+
+#define DEFINE_DCB_FLAGS_GETTER(func_name, property_name) \
+	static char * \
+	func_name (ARGS_GET_FCN) \
+	{ \
+		guint v; \
+		GValue val = G_VALUE_INIT; \
+		g_value_init (&val, G_TYPE_UINT); \
+		g_object_get_property (G_OBJECT (setting), property_name, &val); \
+		v = g_value_get_uint (&val); \
+		g_value_unset (&val); \
+		return dcb_flags_to_string (v); \
+	}
+
+static char *
+dcb_app_priority_to_string (gint priority)
+{
+	return (priority == -1) ? g_strdup (_("-1 (unset)")) : g_strdup_printf ("%d", priority);
+}
+
+#define DEFINE_DCB_APP_PRIORITY_GETTER(func_name, property_name) \
+	static char * \
+	func_name (ARGS_GET_FCN) \
+	{ \
+		int v; \
+		GValue val = G_VALUE_INIT; \
+		g_value_init (&val, G_TYPE_INT); \
+		g_object_get_property (G_OBJECT (setting), property_name, &val); \
+		v = g_value_get_int (&val); \
+		g_value_unset (&val); \
+		return dcb_app_priority_to_string (v); \
+	}
+
+#define DEFINE_DCB_BOOL_GETTER(func_name, getter_func_name) \
+	static char * \
+	func_name (ARGS_GET_FCN) \
+	{ \
+		NMSettingDcb *s_dcb = NM_SETTING_DCB (setting); \
+		GString *str; \
+		guint i; \
+\
+		str = g_string_new (NULL); \
+		for (i = 0; i < 8; i++) { \
+			if (getter_func_name (s_dcb,  i)) \
+				g_string_append_c (str, '1'); \
+			else \
+				g_string_append_c (str, '0'); \
+\
+			if (i < 7) \
+				g_string_append_c (str, ','); \
+		} \
+\
+		return g_string_free (str, FALSE); \
+	}
+
+#define DEFINE_DCB_UINT_GETTER(func_name, getter_func_name) \
+	static char * \
+	func_name (ARGS_GET_FCN) \
+	{ \
+		NMSettingDcb *s_dcb = NM_SETTING_DCB (setting); \
+		GString *str; \
+		guint i; \
+ \
+		str = g_string_new (NULL); \
+		for (i = 0; i < 8; i++) { \
+			g_string_append_printf (str, "%u", getter_func_name (s_dcb, i)); \
+			if (i < 7) \
+				g_string_append_c (str, ','); \
+		} \
+\
+		return g_string_free (str, FALSE); \
+	}
+
+DEFINE_DCB_FLAGS_GETTER (_get_fcn_dcb_app_fcoe_flags, NM_SETTING_DCB_APP_FCOE_FLAGS)
+DEFINE_DCB_APP_PRIORITY_GETTER (_get_fcn_dcb_app_fcoe_priority, NM_SETTING_DCB_APP_FCOE_PRIORITY)
+DEFINE_DCB_FLAGS_GETTER (_get_fcn_dcb_app_iscsi_flags, NM_SETTING_DCB_APP_ISCSI_FLAGS)
+DEFINE_DCB_APP_PRIORITY_GETTER (_get_fcn_dcb_app_iscsi_priority, NM_SETTING_DCB_APP_ISCSI_PRIORITY)
+DEFINE_DCB_FLAGS_GETTER (_get_fcn_dcb_app_fip_flags, NM_SETTING_DCB_APP_FIP_FLAGS)
+DEFINE_DCB_APP_PRIORITY_GETTER (_get_fcn_dcb_app_fip_priority, NM_SETTING_DCB_APP_FIP_PRIORITY)
+
+DEFINE_DCB_FLAGS_GETTER (_get_fcn_dcb_priority_flow_control_flags, NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS)
+DEFINE_DCB_BOOL_GETTER (_get_fcn_dcb_priority_flow_control, nm_setting_dcb_get_priority_flow_control)
+
+DEFINE_DCB_FLAGS_GETTER (_get_fcn_dcb_priority_group_flags, NM_SETTING_DCB_PRIORITY_GROUP_FLAGS)
+DEFINE_DCB_UINT_GETTER (_get_fcn_dcb_priority_group_id, nm_setting_dcb_get_priority_group_id)
+DEFINE_DCB_UINT_GETTER (_get_fcn_dcb_priority_group_bandwidth, nm_setting_dcb_get_priority_group_bandwidth)
+DEFINE_DCB_UINT_GETTER (_get_fcn_dcb_priority_bandwidth, nm_setting_dcb_get_priority_bandwidth)
+DEFINE_DCB_BOOL_GETTER (_get_fcn_dcb_priority_strict, nm_setting_dcb_get_priority_strict_bandwidth)
+DEFINE_DCB_UINT_GETTER (_get_fcn_dcb_priority_traffic_class, nm_setting_dcb_get_priority_traffic_class)
+
+#define DCB_ALL_FLAGS (NM_SETTING_DCB_FLAG_ENABLE | NM_SETTING_DCB_FLAG_ADVERTISE | NM_SETTING_DCB_FLAG_WILLING)
+
+static gboolean
+_set_fcn_dcb_flags (ARGS_SET_FCN)
+{
+	char **strv = NULL, **iter;
+	NMSettingDcbFlags flags = NM_SETTING_DCB_FLAG_NONE;
+	long int t;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	/* Check for overall hex numeric value */
+	if (nmc_string_to_int_base (value, 0, TRUE, 0, DCB_ALL_FLAGS, &t))
+		flags = (guint) t;
+	else {
+		/* Check for individual flag numbers */
+		strv = nmc_strsplit_set (value, " \t,", 0);
+		for (iter = strv; iter && *iter; iter++) {
+			if (!nmc_string_to_int_base (*iter, 0, TRUE, 0, DCB_ALL_FLAGS, &t))
+				t = -1;
+
+			if (   g_ascii_strcasecmp (*iter, "enable") == 0
+			    || g_ascii_strcasecmp (*iter, "enabled") == 0
+			    || t == NM_SETTING_DCB_FLAG_ENABLE)
+				flags |= NM_SETTING_DCB_FLAG_ENABLE;
+			else if (   g_ascii_strcasecmp (*iter, "advertise") == 0
+				 || t == NM_SETTING_DCB_FLAG_ADVERTISE)
+				flags |= NM_SETTING_DCB_FLAG_ADVERTISE;
+			else if (   g_ascii_strcasecmp (*iter, "willing") == 0
+				 || t == NM_SETTING_DCB_FLAG_WILLING)
+				flags |= NM_SETTING_DCB_FLAG_WILLING;
+			else if (   g_ascii_strcasecmp (*iter, "disable") == 0
+				 || g_ascii_strcasecmp (*iter, "disabled") == 0
+				 || t == 0) {
+				/* pass */
+			} else {
+				g_set_error (error, 1, 0, _("'%s' is not a valid DCB flag"), *iter);
+				return FALSE;
+			}
+		}
+		g_strfreev (strv);
+	}
+
+	/* Validate the flags according to the property spec */
+	if (!validate_flags (setting, property_info->property_name, (guint) flags, error))
+		return FALSE;
+
+	g_object_set (setting, property_info->property_name, (guint) flags, NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_dcb_priority (ARGS_SET_FCN)
+{
+	long int priority = 0;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!nmc_string_to_int (value, FALSE, -1, 7, &priority)) {
+		g_set_error (error, 1, 0, _("'%s' is not a DCB app priority"), value);
+		return FALSE;
+	}
+
+	/* Validate the number according to the property spec */
+	if (!validate_int (setting, property_info->property_name, (gint) priority, error))
+		return FALSE;
+
+	g_object_set (setting, property_info->property_name, (gint) priority, NULL);
+	return TRUE;
+}
+
+static gboolean
+dcb_parse_uint_array (const char *val,
+                      guint max,
+                      guint other,
+                      guint *out_array,
+                      GError **error)
+{
+	char **items, **iter;
+	guint i = 0;
+
+	g_return_val_if_fail (out_array != NULL, FALSE);
+
+	items = g_strsplit_set (val, ",", -1);
+	if (g_strv_length (items) != 8) {
+		g_set_error_literal (error, 1, 0, _("must contain 8 comma-separated numbers"));
+		goto error;
+	}
+
+	for (iter = items; iter && *iter; iter++) {
+		long int num = 0;
+		gboolean success;
+
+		*iter = g_strstrip (*iter);
+		success = nmc_string_to_int_base (*iter, 10, TRUE, 0, other ? other : max, &num);
+
+		/* If number is greater than 'max' it must equal 'other' */
+		if (success && other && (num > max) && (num != other))
+			success = FALSE;
+
+		if (!success) {
+			if (other) {
+				g_set_error (error, 1, 0, _("'%s' not a number between 0 and %u (inclusive) or %u"),
+					     *iter, max, other);
+			} else {
+				g_set_error (error, 1, 0, _("'%s' not a number between 0 and %u (inclusive)"),
+					     *iter, max);
+			}
+			goto error;
+		}
+		out_array[i++] = (guint) num;
+	}
+
+	return TRUE;
+
+error:
+	g_strfreev (items);
+	return FALSE;
+}
+
+static void
+dcb_check_feature_enabled (NMSettingDcb *s_dcb, const char *flags_prop)
+{
+	NMSettingDcbFlags flags = NM_SETTING_DCB_FLAG_NONE;
+
+	g_object_get (s_dcb, flags_prop, &flags, NULL);
+	if (!(flags & NM_SETTING_DCB_FLAG_ENABLE))
+		g_print (_("Warning: changes will have no effect until '%s' includes 1 (enabled)\n\n"), flags_prop);
+}
+
+static gboolean
+_set_fcn_dcb_priority_flow_control (ARGS_SET_FCN)
+{
+	guint i = 0;
+	guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!dcb_parse_uint_array (value, 1, 0, nums, error))
+		return FALSE;
+
+	for (i = 0; i < 8; i++)
+		nm_setting_dcb_set_priority_flow_control (NM_SETTING_DCB (setting), i, !!nums[i]);
+
+	dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_dcb_priority_group_id (ARGS_SET_FCN)
+{
+	guint i = 0;
+	guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!dcb_parse_uint_array (value, 7, 15, nums, error))
+		return FALSE;
+
+	for (i = 0; i < 8; i++)
+		nm_setting_dcb_set_priority_group_id (NM_SETTING_DCB (setting), i, nums[i]);
+
+	dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_GROUP_FLAGS);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_dcb_priority_group_bandwidth (ARGS_SET_FCN)
+{
+	guint i = 0, sum = 0;
+	guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!dcb_parse_uint_array (value, 100, 0, nums, error))
+		return FALSE;
+
+	for (i = 0; i < 8; i++)
+		sum += nums[i];
+	if (sum != 100) {
+		g_set_error_literal (error, 1, 0, _("bandwidth percentages must total 100%%"));
+		return FALSE;
+	}
+
+	for (i = 0; i < 8; i++)
+		nm_setting_dcb_set_priority_group_bandwidth (NM_SETTING_DCB (setting), i, nums[i]);
+
+	dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_GROUP_FLAGS);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_dcb_priority_bandwidth (ARGS_SET_FCN)
+{
+	guint i = 0;
+	guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!dcb_parse_uint_array (value, 100, 0, nums, error))
+		return FALSE;
+
+	for (i = 0; i < 8; i++)
+		nm_setting_dcb_set_priority_bandwidth (NM_SETTING_DCB (setting), i, nums[i]);
+
+	dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_GROUP_FLAGS);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_dcb_priority_strict (ARGS_SET_FCN)
+{
+	guint i = 0;
+	guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!dcb_parse_uint_array (value, 1, 0, nums, error))
+		return FALSE;
+
+	for (i = 0; i < 8; i++)
+		nm_setting_dcb_set_priority_strict_bandwidth (NM_SETTING_DCB (setting), i, !!nums[i]);
+
+	dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_GROUP_FLAGS);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_dcb_priority_traffic_class (ARGS_SET_FCN)
+{
+	guint i = 0;
+	guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!dcb_parse_uint_array (value, 7, 0, nums, error))
+		return FALSE;
+
+	for (i = 0; i < 8; i++)
+		nm_setting_dcb_set_priority_traffic_class (NM_SETTING_DCB (setting), i, nums[i]);
+
+	dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_GROUP_FLAGS);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_gsm_sim_operator_id (ARGS_SET_FCN)
+{
+	const char *p = value;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (strlen (value) != 5 && strlen (value) != 6) {
+		g_set_error_literal (error, 1, 0, _("SIM operator ID must be a 5 or 6 number MCCMNC code"));
+		return FALSE;
+	}
+
+	while (p && *p) {
+		if (!g_ascii_isdigit (*p++)) {
+			g_set_error_literal (error, 1, 0, _("SIM operator ID must be a 5 or 6 number MCCMNC code"));
+			return FALSE;
+		}
+	}
+	g_object_set (G_OBJECT (setting),
+	              NM_SETTING_GSM_SIM_OPERATOR_ID,
+	              value,
+	              NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_infiniband_p_key (ARGS_SET_FCN)
+{
+	gboolean p_key_valid = FALSE;
+	long p_key_int;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!strncasecmp (value, "0x", 2))
+		p_key_valid = nmc_string_to_int_base (value + 2, 16, TRUE, 0, G_MAXUINT16, &p_key_int);
+	else
+		p_key_valid = nmc_string_to_int (value, TRUE, -1, G_MAXUINT16, &p_key_int);
+
+	if (!p_key_valid) {
+		if (strcmp (value, "default") == 0)
+			p_key_int = -1;
+		else {
+			g_set_error (error, 1, 0, _("'%s' is not a valid IBoIP P_Key"), value);
+			return FALSE;
+		}
+	}
+	g_object_set (setting, property_info->property_name, (gint) p_key_int, NULL);
+	return TRUE;
+}
+
+
+static char *
+_get_fcn_infiniband_p_key (ARGS_GET_FCN)
+{
+	NMSettingInfiniband *s_infiniband = NM_SETTING_INFINIBAND (setting);
+	int p_key;
+
+	p_key = nm_setting_infiniband_get_p_key (s_infiniband);
+	if (p_key == -1) {
+		if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
+			return g_strdup ("default");
+		else
+			return g_strdup (_("default"));
+	} else
+		return g_strdup_printf ("0x%04x", p_key);
+}
+
+static char *
+_get_fcn_ip_tunnel_mode (ARGS_GET_FCN)
+{
+	NMSettingIPTunnel *s_ip_tunnel = NM_SETTING_IP_TUNNEL (setting);
+	NMIPTunnelMode mode;
+
+	mode = nm_setting_ip_tunnel_get_mode (s_ip_tunnel);
+	return nm_utils_enum_to_str (nm_ip_tunnel_mode_get_type (), mode);
+}
+
+static gboolean
+_set_fcn_ip_tunnel_mode (ARGS_SET_FCN)
+{
+	NMIPTunnelMode mode;
+	gboolean ret;
+
+	ret = nm_utils_enum_from_str (nm_ip_tunnel_mode_get_type(), value,
+	                              (int *) &mode, NULL);
+
+	if (!ret) {
+		gs_free const char **values = NULL;
+		gs_free char *values_str = NULL;
+
+		values = nm_utils_enum_get_values (nm_ip_tunnel_mode_get_type (),
+		                                   NM_IP_TUNNEL_MODE_UNKNOWN + 1,
+		                                   G_MAXINT);
+		values_str = g_strjoinv (",", (char **) values);
+		g_set_error (error, 1, 0, _("invalid mode '%s', use one of %s"),
+		             value, values_str);
+
+		return FALSE;
+	}
+
+	g_object_set (setting, property_info->property_name, mode, NULL);
+	return TRUE;
+}
+
+static NMIPAddress *
+_parse_ip_address (int family, const char *address, GError **error)
+{
+	char *value = g_strdup (address);
+	NMIPAddress *ipaddr;
+
+	ipaddr = nmc_parse_and_build_address (family, g_strstrip (value), error);
+	g_free (value);
+	return ipaddr;
+}
+
+static char *
+_get_fcn_ip_config_addresses (ARGS_GET_FCN)
+{
+	NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting);
+	GString *printable;
+	guint32 num_addresses, i;
+	NMIPAddress *addr;
+
+	printable = g_string_new (NULL);
+
+	num_addresses = nm_setting_ip_config_get_num_addresses (s_ip);
+	for (i = 0; i < num_addresses; i++) {
+		addr = nm_setting_ip_config_get_address (s_ip, i);
+
+		if (printable->len > 0)
+			g_string_append (printable, ", ");
+
+		g_string_append_printf (printable, "%s/%u",
+		                        nm_ip_address_get_address (addr),
+		                        nm_ip_address_get_prefix (addr));
+	}
+
+	return g_string_free (printable, FALSE);
+}
+
+static char *
+_get_fcn_ip_config_routes (ARGS_GET_FCN)
+{
+	NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting);
+	GString *printable;
+	guint32 num_routes, i;
+	NMIPRoute *route;
+
+	printable = g_string_new (NULL);
+
+	num_routes = nm_setting_ip_config_get_num_routes (s_ip);
+	for (i = 0; i < num_routes; i++) {
+		gs_free char *attr_str = NULL;
+		gs_strfreev char **attr_names = NULL;
+		gs_unref_hashtable GHashTable *hash = g_hash_table_new (g_str_hash, g_str_equal);
+		int j;
+
+		route = nm_setting_ip_config_get_route (s_ip, i);
+
+		attr_names = nm_ip_route_get_attribute_names (route);
+		for (j = 0; attr_names && attr_names[j]; j++) {
+			g_hash_table_insert (hash, attr_names[j],
+			                     nm_ip_route_get_attribute (route, attr_names[j]));
+		}
+
+		attr_str = nm_utils_format_variant_attributes (hash, ' ', '=');
+
+		if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE) {
+			if (printable->len > 0)
+				g_string_append (printable, ", ");
+
+			g_string_append_printf (printable, "%s/%u",
+			                        nm_ip_route_get_dest (route),
+			                        nm_ip_route_get_prefix (route));
+
+			if (nm_ip_route_get_next_hop (route))
+				g_string_append_printf (printable, " %s", nm_ip_route_get_next_hop (route));
+			if (nm_ip_route_get_metric (route) != -1)
+				g_string_append_printf (printable, " %u", (guint32) nm_ip_route_get_metric (route));
+			if (attr_str)
+				g_string_append_printf (printable, " %s", attr_str);
+		} else {
+
+			if (printable->len > 0)
+				g_string_append (printable, "; ");
+
+			g_string_append (printable, "{ ");
+
+			g_string_append_printf (printable, "ip = %s/%u",
+			                        nm_ip_route_get_dest (route),
+			                        nm_ip_route_get_prefix (route));
+
+			if (nm_ip_route_get_next_hop (route)) {
+				g_string_append_printf (printable, ", nh = %s",
+				                        nm_ip_route_get_next_hop (route));
+			}
+
+			if (nm_ip_route_get_metric (route) != -1)
+				g_string_append_printf (printable, ", mt = %u", (guint32) nm_ip_route_get_metric (route));
+			if (attr_str)
+				g_string_append_printf (printable, " %s", attr_str);
+
+			g_string_append (printable, " }");
+		}
+	}
+
+	return g_string_free (printable, FALSE);
+}
+
+static char *
+_get_fcn_ip4_config_dad_timeout (ARGS_GET_FCN)
+{
+	NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting);
+	gint dad_timeout;
+
+	dad_timeout = nm_setting_ip_config_get_dad_timeout (s_ip);
+	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
+		return g_strdup_printf ("%d", dad_timeout);
+
+	switch (dad_timeout) {
+	case -1:
+		return g_strdup_printf (_("%d (default)"), dad_timeout);
+	case 0:
+		return g_strdup_printf (_("%d (off)"), dad_timeout);
+	default:
+		return g_strdup_printf ("%d", dad_timeout);
+	}
+}
+
+static const char *ipv4_valid_methods[] = {
+	NM_SETTING_IP4_CONFIG_METHOD_AUTO,
+	NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL,
+	NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
+	NM_SETTING_IP4_CONFIG_METHOD_SHARED,
+	NM_SETTING_IP4_CONFIG_METHOD_DISABLED,
+	NULL
+};
+
+static gboolean
+_set_fcn_ip4_config_method (ARGS_SET_FCN)
+{
+	/* Silently accept "static" and convert to "manual" */
+	if (value && strlen (value) > 1 && matches (value, "static"))
+		value = NM_SETTING_IP4_CONFIG_METHOD_MANUAL;
+
+	return check_and_set_string (setting, property_info->property_name, value, ipv4_valid_methods, error);
+}
+
+static gboolean
+_set_fcn_ip4_config_dns (ARGS_SET_FCN)
+{
+	char **strv = NULL, **iter, *addr;
+	guint32 ip4_addr;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	strv = nmc_strsplit_set (value, " \t,", 0);
+	for (iter = strv; iter && *iter; iter++) {
+		addr = g_strstrip (*iter);
+		if (inet_pton (AF_INET, addr, &ip4_addr) < 1) {
+			g_set_error (error, 1, 0, _("invalid IPv4 address '%s'"), addr);
+			g_strfreev (strv);
+			return FALSE;
+		}
+		nm_setting_ip_config_add_dns (NM_SETTING_IP_CONFIG (setting), addr);
+	}
+	g_strfreev (strv);
+	return TRUE;
+}
+
+static gboolean
+_validate_and_remove_ipv4_dns (NMSettingIPConfig *setting,
+                               const char *dns,
+                               GError **error)
+{
+	guint32 ip4_addr;
+	gboolean ret;
+
+	if (inet_pton (AF_INET, dns, &ip4_addr) < 1) {
+		g_set_error (error, 1, 0, _("invalid IPv4 address '%s'"), dns);
+		return FALSE;
+	}
+
+	ret = nm_setting_ip_config_remove_dns_by_value (setting, dns);
+	if (!ret)
+		g_set_error (error, 1, 0, _("the property doesn't contain DNS server '%s'"), dns);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_dns,
+                               NM_SETTING_IP_CONFIG,
+                               nm_setting_ip_config_get_num_dns,
+                               nm_setting_ip_config_remove_dns,
+                               _validate_and_remove_ipv4_dns)
+
+static gboolean
+_set_fcn_ip4_config_dns_search (ARGS_SET_FCN)
+{
+	char **strv = NULL;
+	guint i = 0;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	strv = nmc_strsplit_set (value, " \t,", 0);
+	if (!verify_string_list (strv, property_info->property_name, nmc_util_is_domain, error)) {
+		g_strfreev (strv);
+		return FALSE;
+	}
+
+	while (strv && strv[i])
+		nm_setting_ip_config_add_dns_search (NM_SETTING_IP_CONFIG (setting), strv[i++]);
+	g_strfreev (strv);
+
+	return TRUE;
+}
+
+static gboolean
+_validate_and_remove_ipv4_dns_search (NMSettingIPConfig *setting,
+                                      const char *dns_search,
+                                      GError **error)
+{
+	gboolean ret;
+
+	ret = nm_setting_ip_config_remove_dns_search_by_value (setting, dns_search);
+	if (!ret)
+		g_set_error (error, 1, 0,
+		             _("the property doesn't contain DNS search domain '%s'"),
+		             dns_search);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_dns_search,
+                               NM_SETTING_IP_CONFIG,
+                               nm_setting_ip_config_get_num_dns_searches,
+                               nm_setting_ip_config_remove_dns_search,
+                               _validate_and_remove_ipv4_dns_search)
+
+static gboolean
+_set_fcn_ip4_config_dns_options (ARGS_SET_FCN)
+{
+	char **strv = NULL;
+	guint i = 0;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	nm_setting_ip_config_clear_dns_options (NM_SETTING_IP_CONFIG (setting), TRUE);
+	strv = nmc_strsplit_set (value, " \t,", 0);
+	while (strv && strv[i])
+		nm_setting_ip_config_add_dns_option (NM_SETTING_IP_CONFIG (setting), strv[i++]);
+	g_strfreev (strv);
+
+	return TRUE;
+}
+
+static gboolean
+_validate_and_remove_ipv4_dns_option (NMSettingIPConfig *setting,
+                                      const char *dns_option,
+                                      GError **error)
+{
+	gboolean ret;
+
+	ret = nm_setting_ip_config_remove_dns_option_by_value (setting, dns_option);
+	if (!ret)
+		g_set_error (error, 1, 0,
+		             _("the property doesn't contain DNS option '%s'"),
+		             dns_option);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_dns_options,
+                               NM_SETTING_IP_CONFIG,
+                               nm_setting_ip_config_get_num_dns_options,
+                               nm_setting_ip_config_remove_dns_option,
+                               _validate_and_remove_ipv4_dns_option)
+
+static NMIPAddress *
+_parse_ipv4_address (const char *address, GError **error)
+{
+	return _parse_ip_address (AF_INET, address, error);
+}
+
+static gboolean
+_set_fcn_ip4_config_addresses (ARGS_SET_FCN)
+{
+	char **strv = NULL, **iter;
+	NMIPAddress *ip4addr;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	strv = nmc_strsplit_set (value, ",", 0);
+	for (iter = strv; iter && *iter; iter++) {
+		ip4addr = _parse_ipv4_address (*iter, error);
+		if (!ip4addr) {
+			g_strfreev (strv);
+			return FALSE;
+		}
+		nm_setting_ip_config_add_address (NM_SETTING_IP_CONFIG (setting), ip4addr);
+		nm_ip_address_unref (ip4addr);
+	}
+	g_strfreev (strv);
+	return TRUE;
+}
+
+static gboolean
+_validate_and_remove_ipv4_address (NMSettingIPConfig *setting,
+                                   const char *address,
+                                   GError **error)
+{
+	NMIPAddress *ip4addr;
+	gboolean ret;
+
+	ip4addr = _parse_ipv4_address (address, error);
+	if (!ip4addr)
+		return FALSE;
+
+	ret = nm_setting_ip_config_remove_address_by_value (setting, ip4addr);
+	if (!ret)
+		g_set_error (error, 1, 0,
+		             _("the property doesn't contain IP address '%s'"), address);
+	nm_ip_address_unref (ip4addr);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_addresses,
+                               NM_SETTING_IP_CONFIG,
+                               nm_setting_ip_config_get_num_addresses,
+                               nm_setting_ip_config_remove_address,
+                               _validate_and_remove_ipv4_address)
+
+static gboolean
+_set_fcn_ip4_config_gateway (ARGS_SET_FCN)
+{
+	NMIPAddress *ip4addr;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (strchr (value, '/')) {
+		g_set_error (error, 1, 0,
+	                     _("invalid gateway address '%s'"), value);
+		return FALSE;
+	}
+	ip4addr = _parse_ipv4_address (value, error);
+	if (!ip4addr)
+		return FALSE;
+
+	g_object_set (setting, property_info->property_name, value, NULL);
+	nm_ip_address_unref (ip4addr);
+	return TRUE;
+}
+
+static NMIPRoute *
+_parse_ipv4_route (const char *route, GError **error)
+{
+	return nmc_parse_and_build_route (AF_INET, route, error);
+}
+
+static gboolean
+_set_fcn_ip4_config_routes (ARGS_SET_FCN)
+{
+	char **strv = NULL, **iter;
+	NMIPRoute *ip4route;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	strv = nmc_strsplit_set (value, ",", 0);
+	for (iter = strv; iter && *iter; iter++) {
+		ip4route = _parse_ipv4_route (*iter, error);
+		if (!ip4route) {
+			g_strfreev (strv);
+			return FALSE;
+		}
+		nm_setting_ip_config_add_route (NM_SETTING_IP_CONFIG (setting), ip4route);
+		nm_ip_route_unref (ip4route);
+	}
+	g_strfreev (strv);
+	return TRUE;
+}
+
+static gboolean
+_validate_and_remove_ipv4_route (NMSettingIPConfig *setting,
+                                 const char *route,
+                                 GError **error)
+{
+	NMIPRoute *ip4route;
+	gboolean ret;
+
+	ip4route = _parse_ipv4_route (route, error);
+	if (!ip4route)
+		return FALSE;
+
+	ret = nm_setting_ip_config_remove_route_by_value (setting, ip4route);
+	if (!ret)
+		g_set_error (error, 1, 0, _("the property doesn't contain route '%s'"), route);
+	nm_ip_route_unref (ip4route);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_routes,
+                               NM_SETTING_IP_CONFIG,
+                               nm_setting_ip_config_get_num_routes,
+                               nm_setting_ip_config_remove_route,
+                               _validate_and_remove_ipv4_route)
+
+static char *
+_get_fcn_ip6_config_ip6_privacy (ARGS_GET_FCN)
+{
+	NMSettingIP6Config *s_ip6 = NM_SETTING_IP6_CONFIG (setting);
+	return ip6_privacy_to_string (nm_setting_ip6_config_get_ip6_privacy (s_ip6), get_type);
+}
+
+static const char *ipv6_valid_methods[] = {
+	NM_SETTING_IP6_CONFIG_METHOD_IGNORE,
+	NM_SETTING_IP6_CONFIG_METHOD_AUTO,
+	NM_SETTING_IP6_CONFIG_METHOD_DHCP,
+	NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL,
+	NM_SETTING_IP6_CONFIG_METHOD_MANUAL,
+	NM_SETTING_IP6_CONFIG_METHOD_SHARED,
+	NULL
+};
+
+static gboolean
+_set_fcn_ip6_config_method (ARGS_SET_FCN)
+{
+	/* Silently accept "static" and convert to "manual" */
+	if (value && strlen (value) > 1 && matches (value, "static"))
+		value = NM_SETTING_IP6_CONFIG_METHOD_MANUAL;
+
+	return check_and_set_string (setting, property_info->property_name, value, ipv6_valid_methods, error);
+}
+
+static gboolean
+_set_fcn_ip6_config_dns (ARGS_SET_FCN)
+{
+	char **strv = NULL, **iter, *addr;
+	struct in6_addr ip6_addr;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	strv = nmc_strsplit_set (value, " \t,", 0);
+	for (iter = strv; iter && *iter; iter++) {
+		addr = g_strstrip (*iter);
+		if (inet_pton (AF_INET6, addr, &ip6_addr) < 1) {
+			g_set_error (error, 1, 0, _("invalid IPv6 address '%s'"), addr);
+			g_strfreev (strv);
+			return FALSE;
+		}
+		nm_setting_ip_config_add_dns (NM_SETTING_IP_CONFIG (setting), addr);
+	}
+	g_strfreev (strv);
+	return TRUE;
+}
+
+static gboolean
+_validate_and_remove_ipv6_dns (NMSettingIPConfig *setting,
+                               const char *dns,
+                               GError **error)
+{
+	struct in6_addr ip6_addr;
+	gboolean ret;
+
+	if (inet_pton (AF_INET6, dns, &ip6_addr) < 1) {
+		g_set_error (error, 1, 0, _("invalid IPv6 address '%s'"), dns);
+		return FALSE;
+	}
+
+	ret = nm_setting_ip_config_remove_dns_by_value (setting, dns);
+	if (!ret)
+		g_set_error (error, 1, 0, _("the property doesn't contain DNS server '%s'"), dns);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_dns,
+                               NM_SETTING_IP_CONFIG,
+                               nm_setting_ip_config_get_num_dns,
+                               nm_setting_ip_config_remove_dns,
+                               _validate_and_remove_ipv6_dns)
+
+static gboolean
+_set_fcn_ip6_config_dns_search (ARGS_SET_FCN)
+{
+	char **strv = NULL;
+	guint i = 0;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	strv = nmc_strsplit_set (value, " \t,", 0);
+	if (!verify_string_list (strv, property_info->property_name, nmc_util_is_domain, error)) {
+		g_strfreev (strv);
+		return FALSE;
+	}
+
+	while (strv && strv[i])
+		nm_setting_ip_config_add_dns_search (NM_SETTING_IP_CONFIG (setting), strv[i++]);
+	g_strfreev (strv);
+
+	return TRUE;
+}
+
+static gboolean
+_validate_and_remove_ipv6_dns_search (NMSettingIPConfig *setting,
+                                      const char *dns_search,
+                                      GError **error)
+{
+	gboolean ret;
+
+	ret = nm_setting_ip_config_remove_dns_search_by_value (setting, dns_search);
+	if (!ret)
+		g_set_error (error, 1, 0,
+		             _("the property doesn't contain DNS search domain '%s'"),
+		             dns_search);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_dns_search,
+                               NM_SETTING_IP_CONFIG,
+                               nm_setting_ip_config_get_num_dns_searches,
+                               nm_setting_ip_config_remove_dns_search,
+                               _validate_and_remove_ipv6_dns_search)
+
+static gboolean
+_set_fcn_ip6_config_dns_options (ARGS_SET_FCN)
+{
+	char **strv = NULL;
+	guint i = 0;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	nm_setting_ip_config_clear_dns_options (NM_SETTING_IP_CONFIG (setting), TRUE);
+	strv = nmc_strsplit_set (value, " \t,", 0);
+	while (strv && strv[i])
+		nm_setting_ip_config_add_dns_option (NM_SETTING_IP_CONFIG (setting), strv[i++]);
+	g_strfreev (strv);
+
+	return TRUE;
+}
+
+static gboolean
+_validate_and_remove_ipv6_dns_option (NMSettingIPConfig *setting,
+                                      const char *dns_option,
+                                      GError **error)
+{
+	gboolean ret;
+
+	ret = nm_setting_ip_config_remove_dns_option_by_value (setting, dns_option);
+	if (!ret)
+		g_set_error (error, 1, 0,
+		             _("the property doesn't contain DNS option '%s'"),
+		             dns_option);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_dns_options,
+                               NM_SETTING_IP_CONFIG,
+                               nm_setting_ip_config_get_num_dns_options,
+                               nm_setting_ip_config_remove_dns_option,
+                               _validate_and_remove_ipv6_dns_option)
+
+static NMIPAddress *
+_parse_ipv6_address (const char *address, GError **error)
+{
+	return _parse_ip_address (AF_INET6, address, error);
+}
+
+static gboolean
+_set_fcn_ip6_config_addresses (ARGS_SET_FCN)
+{
+	char **strv = NULL, **iter;
+	NMIPAddress *ip6addr;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	strv = nmc_strsplit_set (value, ",", 0);
+	for (iter = strv; iter && *iter; iter++) {
+		ip6addr = _parse_ipv6_address (*iter, error);
+		if (!ip6addr) {
+			g_strfreev (strv);
+			return FALSE;
+		}
+		nm_setting_ip_config_add_address (NM_SETTING_IP_CONFIG (setting), ip6addr);
+		nm_ip_address_unref (ip6addr);
+	}
+	g_strfreev (strv);
+	return TRUE;
+}
+
+static gboolean
+_validate_and_remove_ipv6_address (NMSettingIPConfig *setting,
+                                   const char *address,
+                                   GError **error)
+{
+	NMIPAddress *ip6addr;
+	gboolean ret;
+
+	ip6addr = _parse_ipv6_address (address, error);
+	if (!ip6addr)
+		return FALSE;
+
+	ret = nm_setting_ip_config_remove_address_by_value (setting, ip6addr);
+	if (!ret)
+		g_set_error (error, 1, 0, _("the property doesn't contain IP address '%s'"), address);
+	nm_ip_address_unref (ip6addr);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_addresses,
+                               NM_SETTING_IP_CONFIG,
+                               nm_setting_ip_config_get_num_addresses,
+                               nm_setting_ip_config_remove_address,
+                               _validate_and_remove_ipv6_address)
+
+static gboolean
+_set_fcn_ip6_config_gateway (ARGS_SET_FCN)
+{
+	NMIPAddress *ip6addr;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (strchr (value, '/')) {
+		g_set_error (error, 1, 0,
+	                     _("invalid gateway address '%s'"), value);
+		return FALSE;
+	}
+	ip6addr = _parse_ipv6_address (value, error);
+	if (!ip6addr)
+		return FALSE;
+
+	g_object_set (setting, property_info->property_name, value, NULL);
+	nm_ip_address_unref (ip6addr);
+	return TRUE;
+}
+
+static NMIPRoute *
+_parse_ipv6_route (const char *route, GError **error)
+{
+	return nmc_parse_and_build_route (AF_INET6, route, error);
+}
+
+static gboolean
+_set_fcn_ip6_config_routes (ARGS_SET_FCN)
+{
+	char **strv = NULL, **iter;
+	NMIPRoute *ip6route;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	strv = nmc_strsplit_set (value, ",", 0);
+	for (iter = strv; iter && *iter; iter++) {
+		ip6route = _parse_ipv6_route (*iter, error);
+		if (!ip6route) {
+			g_strfreev (strv);
+			return FALSE;
+		}
+		nm_setting_ip_config_add_route (NM_SETTING_IP_CONFIG (setting), ip6route);
+		nm_ip_route_unref (ip6route);
+	}
+	g_strfreev (strv);
+	return TRUE;
+}
+
+static gboolean
+_validate_and_remove_ipv6_route (NMSettingIPConfig *setting,
+                                 const char *route,
+                                 GError **error)
+{
+	NMIPRoute *ip6route;
+	gboolean ret;
+
+	ip6route = _parse_ipv6_route (route, error);
+	if (!ip6route)
+		return FALSE;
+
+	ret = nm_setting_ip_config_remove_route_by_value (setting, ip6route);
+	if (!ret)
+		g_set_error (error, 1, 0, _("the property doesn't contain route '%s'"), route);
+	nm_ip_route_unref (ip6route);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_routes,
+                               NM_SETTING_IP_CONFIG,
+                               nm_setting_ip_config_get_num_routes,
+                               nm_setting_ip_config_remove_route,
+                               _validate_and_remove_ipv6_route)
+
+static gboolean
+_set_fcn_ip6_config_ip6_privacy (ARGS_SET_FCN)
+{
+	unsigned long val_int;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!nmc_string_to_uint (value, FALSE, 0, 0, &val_int)) {
+		g_set_error (error, 1, 0, _("'%s' is not a number"), value);
+		return FALSE;
+	}
+
+	if (   val_int != NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED
+	    && val_int != NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR
+	    && val_int != NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR) {
+		g_set_error (error, 1, 0, _("'%s' is not valid; use 0, 1, or 2"), value);
+		return FALSE;
+	}
+
+	g_object_set (setting, property_info->property_name, val_int, NULL);
+	return TRUE;
+}
+
+static char *
+_get_fcn_ip6_config_addr_gen_mode (ARGS_GET_FCN)
+{
+	NMSettingIP6Config *s_ip6 = NM_SETTING_IP6_CONFIG (setting);
+	NMSettingIP6ConfigAddrGenMode addr_gen_mode;
+
+	addr_gen_mode = nm_setting_ip6_config_get_addr_gen_mode (s_ip6);
+	return nm_utils_enum_to_str (nm_setting_ip6_config_addr_gen_mode_get_type (), addr_gen_mode);
+}
+
+
+static gboolean
+_set_fcn_ip6_config_addr_gen_mode (ARGS_SET_FCN)
+{
+	NMSettingIP6ConfigAddrGenMode addr_gen_mode;
+
+	if (!nm_utils_enum_from_str (nm_setting_ip6_config_addr_gen_mode_get_type (), value,
+	                             (int *) &addr_gen_mode, NULL)) {
+		g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
+		             value, "eui64,stable-privacy");
+			return FALSE;
+	}
+
+	g_object_set (setting, property_info->property_name, addr_gen_mode, NULL);
+	return TRUE;
+}
+
+static char *
+_get_fcn_macsec_mode (ARGS_GET_FCN)
+{
+	NMSettingMacsec *s_macsec = NM_SETTING_MACSEC (setting);
+	NMSettingMacsecMode mode;
+
+	mode = nm_setting_macsec_get_mode (s_macsec);
+	return nm_utils_enum_to_str (nm_setting_macsec_mode_get_type (), mode);
+}
+
+static gboolean
+_set_fcn_macsec_mode (ARGS_SET_FCN)
+{
+	NMSettingMacsecMode mode;
+	gs_free char *options = NULL;
+
+	if (!nm_utils_enum_from_str (nm_setting_macsec_mode_get_type (), value,
+	                             (int *) &mode, NULL)) {
+		options = g_strjoinv (",",
+		                      (char **) nm_utils_enum_get_values (nm_setting_macsec_mode_get_type (),
+		                                                          G_MININT,
+		                                                          G_MAXINT));
+		g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
+		             value, options);
+			return FALSE;
+	}
+
+	g_object_set (setting, property_info->property_name, mode, NULL);
+	return TRUE;
+}
+
+static char *
+_get_fcn_macsec_validation (ARGS_GET_FCN)
+{
+	NMSettingMacsec *s_macsec = NM_SETTING_MACSEC (setting);
+	NMSettingMacsecValidation validation;
+
+	validation = nm_setting_macsec_get_validation (s_macsec);
+	return nm_utils_enum_to_str (nm_setting_macsec_validation_get_type (), validation);
+}
+
+static gboolean
+_set_fcn_macsec_validation (ARGS_SET_FCN)
+{
+	NMSettingMacsecMode validation;
+	gs_free char *options = NULL;
+
+	if (!nm_utils_enum_from_str (nm_setting_macsec_validation_get_type (), value,
+	                             (int *) &validation, NULL)) {
+		options = g_strjoinv (",",
+		                      (char **) nm_utils_enum_get_values (nm_setting_macsec_validation_get_type (),
+		                                                          G_MININT,
+		                                                          G_MAXINT));
+		g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
+		             value, options);
+			return FALSE;
+	}
+
+	g_object_set (setting, property_info->property_name, validation, NULL);
+	return TRUE;
+}
+
+static char *
+_get_fcn_macvlan_mode (ARGS_GET_FCN)
+{
+	NMSettingMacvlan *s_macvlan = NM_SETTING_MACVLAN (setting);
+	NMSettingMacvlanMode mode;
+	char *tmp, *str;
+
+	mode = nm_setting_macvlan_get_mode (s_macvlan);
+	tmp = nm_utils_enum_to_str (nm_setting_macvlan_mode_get_type (), mode);
+
+	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
+		str = g_strdup (tmp ? tmp : "");
+	else
+		str = g_strdup_printf ("%d (%s)", mode, tmp ? tmp : "");
+	g_free (tmp);
+
+	return str;
+}
+
+static gboolean
+_set_fcn_macvlan_mode (ARGS_SET_FCN)
+{
+	NMSettingMacvlanMode mode;
+	gs_free const char **options = NULL;
+	gs_free char *options_str = NULL;
+	long int t;
+	gboolean ret;
+
+	if (nmc_string_to_int_base (value, 0, TRUE, 0, _NM_SETTING_MACVLAN_MODE_NUM - 1, &t))
+		mode = (NMSettingMacvlanMode) t;
+	else {
+		ret = nm_utils_enum_from_str (nm_setting_macvlan_mode_get_type (), value,
+		                              (int *) &mode, NULL);
+
+		if (!ret) {
+				options = nm_utils_enum_get_values (nm_setting_macvlan_mode_get_type(),
+				                                    NM_SETTING_MACVLAN_MODE_UNKNOWN + 1,
+				                                    G_MAXINT);
+				options_str = g_strjoinv (",", (char **) options);
+				g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
+				             value, options_str);
+				return FALSE;
+			}
+		}
+
+	g_object_set (setting, property_info->property_name, (guint) mode, NULL);
+	return TRUE;
+}
+
+static char *
+_get_fcn_olpc_mesh_ssid (ARGS_GET_FCN)
+{
+	NMSettingOlpcMesh *s_olpc_mesh = NM_SETTING_OLPC_MESH (setting);
+	GBytes *ssid;
+	char *ssid_str = NULL;
+
+	ssid = nm_setting_olpc_mesh_get_ssid (s_olpc_mesh);
+	if (ssid) {
+		ssid_str = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL),
+		                                  g_bytes_get_size (ssid));
+	}
+
+	return ssid_str;
+}
+
+static gboolean
+_set_fcn_olpc_mesh_channel (ARGS_SET_FCN)
+{
+	unsigned long chan_int;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!nmc_string_to_uint (value, TRUE, 1, 13, &chan_int)) {
+		g_set_error (error, 1, 0, _("'%s' is not a valid channel; use <1-13>"), value);
+		return FALSE;
+	}
+	g_object_set (setting, property_info->property_name, chan_int, NULL);
+	return TRUE;
+}
+
+static char *
+_get_fcn_proxy_method (ARGS_GET_FCN)
+{
+	NMSettingProxy *s_proxy = NM_SETTING_PROXY (setting);
+	NMSettingProxyMethod method;
+
+	method = nm_setting_proxy_get_method (s_proxy);
+	return nm_utils_enum_to_str (nm_setting_proxy_method_get_type (), method);
+}
+
+static gboolean
+_set_fcn_proxy_method (ARGS_SET_FCN)
+{
+	int method;
+	gboolean ret;
+
+	ret = nm_utils_enum_from_str (nm_setting_proxy_method_get_type(), value,
+	                              &method, NULL);
+
+	if (!ret) {
+		gs_free const char **values = NULL;
+		gs_free char *values_str = NULL;
+
+		values = nm_utils_enum_get_values (nm_setting_proxy_method_get_type (),
+		                                   NM_SETTING_PROXY_METHOD_NONE,
+		                                   G_MAXINT);
+		values_str = g_strjoinv (",", (char **) values);
+		g_set_error (error, 1, 0, _("invalid method '%s', use one of %s"),
+		             value, values_str);
+
+		return FALSE;
+	}
+
+	g_object_set (setting, property_info->property_name, method, NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_proxy_pac_script (ARGS_SET_FCN)
+{
+	char *script = NULL;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!nmc_proxy_check_script (value, &script, error)) {
+		return FALSE;
+	}
+	g_object_set (setting, property_info->property_name, script, NULL);
+	g_free (script);
+	return TRUE;
+}
+
+static char *
+_get_fcn_serial_parity (ARGS_GET_FCN)
+{
+	NMSettingSerial *s_serial = NM_SETTING_SERIAL (setting);
+
+	switch (nm_setting_serial_get_parity (s_serial)) {
+	case NM_SETTING_SERIAL_PARITY_EVEN:
+		return g_strdup ("even");
+	case NM_SETTING_SERIAL_PARITY_ODD:
+		return g_strdup ("odd");
+	default:
+	case NM_SETTING_SERIAL_PARITY_NONE:
+		return g_strdup ("none");
+	}
+}
+
+static gboolean
+_set_fcn_serial_parity (ARGS_SET_FCN)
+{
+	NMSettingSerialParity parity;
+
+	if (value[0] == 'E' || value[0] == 'e')
+		parity = NM_SETTING_SERIAL_PARITY_EVEN;
+	else if (value[0] == 'O' || value[0] == 'o')
+		parity = NM_SETTING_SERIAL_PARITY_ODD;
+	else if (value[0] == 'N' || value[0] == 'n')
+		parity = NM_SETTING_SERIAL_PARITY_NONE;
+	else {
+		g_set_error (error, 1, 0, _("'%s' is not valid; use [e, o, n]"), value);
+		return FALSE;
+	}
+
+	g_object_set (setting, property_info->property_name, parity, NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_team_config (ARGS_SET_FCN)
+{
+	char *json = NULL;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!nmc_team_check_config (value, &json, error)) {
+		return FALSE;
+	}
+	g_object_set (setting, property_info->property_name, json, NULL);
+	g_free (json);
+	return TRUE;
+}
+
+static char *
+_get_fcn_tun_mode (ARGS_GET_FCN)
+{
+	NMSettingTun *s_tun = NM_SETTING_TUN (setting);
+	NMSettingTunMode mode;
+	char *tmp, *str;
+
+	mode = nm_setting_tun_get_mode (s_tun);
+	tmp = nm_utils_enum_to_str (nm_setting_tun_mode_get_type (), mode);
+	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
+		str = g_strdup_printf ("%s", tmp ? tmp : "");
+	else
+		str = g_strdup_printf ("%d (%s)", mode, tmp ? tmp : "");
+	g_free (tmp);
+	return str;
+}
+
+static gboolean
+_set_fcn_tun_mode (ARGS_SET_FCN)
+{
+	NMSettingTunMode mode;
+	gboolean ret;
+	long int t;
+
+	if (nmc_string_to_int_base (value, 0, TRUE, 0, NM_SETTING_TUN_MODE_TAP, &t))
+		mode = (NMSettingTunMode) t;
+	else {
+		ret = nm_utils_enum_from_str (nm_setting_tun_mode_get_type (), value,
+		                              (int *) &mode, NULL);
+
+		if (!ret) {
+			g_set_error (error, 1, 0, _("invalid option '%s', use '%s' or '%s'"),
+			             value, "tun", "tap");
+			return FALSE;
+		}
+	}
+
+	g_object_set (setting, property_info->property_name, (guint) mode, NULL);
+	return TRUE;
+}
+
+static char *
+_get_fcn_vlan_flags (ARGS_GET_FCN)
+{
+	NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting);
+	return vlan_flags_to_string (nm_setting_vlan_get_flags (s_vlan), get_type);
+}
+
+static char *
+_get_fcn_vlan_ingress_priority_map (ARGS_GET_FCN)
+{
+	NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting);
+	return vlan_priorities_to_string (s_vlan, NM_VLAN_INGRESS_MAP);
+}
+
+static char *
+_get_fcn_vlan_egress_priority_map (ARGS_GET_FCN)
+{
+	NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting);
+	return vlan_priorities_to_string (s_vlan, NM_VLAN_EGRESS_MAP);
+}
+
+static gboolean
+_set_vlan_xgress_priority_map (NMSetting *setting,
+                               const char *value,
+                               NMVlanPriorityMap map_type,
+                               GError **error)
+{
+	char **prio_map, **p;
+
+	prio_map = nmc_vlan_parse_priority_maps (value, map_type, error);
+	if (!prio_map)
+		return FALSE;
+
+	for (p = prio_map; p && *p; p++)
+		nm_setting_vlan_add_priority_str (NM_SETTING_VLAN (setting), map_type, *p);
+
+	g_strfreev (prio_map);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_vlan_ingress_priority_map (ARGS_SET_FCN)
+{
+	return _set_vlan_xgress_priority_map (setting, value, NM_VLAN_INGRESS_MAP, error);
+}
+
+static gboolean
+_set_fcn_vlan_egress_priority_map (ARGS_SET_FCN)
+{
+	return _set_vlan_xgress_priority_map (setting, value, NM_VLAN_EGRESS_MAP, error);
+}
+
+static gboolean
+_remove_vlan_xgress_priority_map (NMSetting *setting,
+                                  const NMMetaPropertyInfo *property_info,
+                                  const char *value,
+                                  guint32 idx,
+                                  NMVlanPriorityMap map_type,
+                                  GError **error)
+{
+	guint32 num;
+
+	/* If value != NULL, remove by value */
+	if (value) {
+		gboolean ret;
+		char **prio_map;
+		gs_free char *v = g_strdup (value);
+
+		prio_map = nmc_vlan_parse_priority_maps (v, map_type, error);
+		if (!prio_map)
+			return FALSE;
+		if (prio_map[1])
+			g_print (_("Warning: only one mapping at a time is supported; taking the first one (%s)\n"),
+			         prio_map[0]);
+		ret = nm_setting_vlan_remove_priority_str_by_value (NM_SETTING_VLAN (setting),
+		                                                    map_type,
+		                                                    prio_map[0]);
+
+		if (!ret)
+			g_set_error (error, 1, 0, _("the property doesn't contain mapping '%s'"), prio_map[0]);
+		g_strfreev (prio_map);
+		return ret;
+	}
+
+	/* Else remove by index */
+	num = nm_setting_vlan_get_num_priorities (NM_SETTING_VLAN (setting), map_type);
+	if (num == 0) {
+		g_set_error_literal (error, 1, 0, _("no priority to remove"));
+		return FALSE;
+	}
+	if (idx >= num) {
+		g_set_error (error, 1, 0, _("index '%d' is not in the range of <0-%d>"),
+		             idx, num - 1);
+		return FALSE;
+	}
+
+	nm_setting_vlan_remove_priority (NM_SETTING_VLAN (setting), map_type, idx);
+	return TRUE;
+}
+
+static gboolean
+_remove_fcn_vlan_ingress_priority_map (ARGS_REMOVE_FCN)
+{
+	return _remove_vlan_xgress_priority_map (setting,
+	                                         property_info,
+	                                         value,
+	                                         idx,
+	                                         NM_VLAN_INGRESS_MAP,
+	                                         error);
+}
+
+static gboolean
+_remove_fcn_vlan_egress_priority_map (ARGS_REMOVE_FCN)
+{
+	return _remove_vlan_xgress_priority_map (setting,
+	                                         property_info,
+	                                         value,
+	                                         idx,
+	                                         NM_VLAN_EGRESS_MAP,
+	                                         error);
+}
+
+static char *
+_get_fcn_vpn_data (ARGS_GET_FCN)
+{
+	NMSettingVpn *s_vpn = NM_SETTING_VPN (setting);
+	GString *data_item_str;
+
+	data_item_str = g_string_new (NULL);
+	nm_setting_vpn_foreach_data_item (s_vpn, &vpn_data_item, data_item_str);
+
+	return g_string_free (data_item_str, FALSE);
+}
+
+static char *
+_get_fcn_vpn_secrets (ARGS_GET_FCN)
+{
+	NMSettingVpn *s_vpn = NM_SETTING_VPN (setting);
+	GString *secret_str;
+
+	secret_str = g_string_new (NULL);
+	nm_setting_vpn_foreach_secret (s_vpn, &vpn_data_item, secret_str);
+
+	return g_string_free (secret_str, FALSE);
+}
+
+static const char *
+_validate_vpn_hash_value (const char *option, const char *value, GError **error)
+{
+	/* nm_setting_vpn_add_data_item() and nm_setting_vpn_add_secret() does not
+	 * allow empty strings */
+	if (!value || !*value) {
+		g_set_error (error, 1, 0, _("'%s' cannot be empty"), option);
+		return NULL;
+	}
+	return value;
+}
+
+DEFINE_SETTER_OPTIONS (_set_fcn_vpn_data,
+                       NM_SETTING_VPN,
+                       NMSettingVpn,
+                       nm_setting_vpn_add_data_item,
+                       NULL,
+                       _validate_vpn_hash_value)
+DEFINE_REMOVER_OPTION (_remove_fcn_vpn_data,
+                       NM_SETTING_VPN,
+                       nm_setting_vpn_remove_data_item)
+
+DEFINE_SETTER_OPTIONS (_set_fcn_vpn_secrets,
+                       NM_SETTING_VPN,
+                       NMSettingVpn,
+                       nm_setting_vpn_add_secret,
+                       NULL,
+                       _validate_vpn_hash_value)
+DEFINE_REMOVER_OPTION (_remove_fcn_vpn_secrets,
+                       NM_SETTING_VPN,
+                       nm_setting_vpn_remove_secret)
+
+static char *
+_get_fcn_wired_wake_on_lan (ARGS_GET_FCN)
+{
+	NMSettingWired *s_wired = NM_SETTING_WIRED (setting);
+	NMSettingWiredWakeOnLan wol;
+	char *tmp, *str;
+
+	wol = nm_setting_wired_get_wake_on_lan (s_wired);
+	tmp = nm_utils_enum_to_str (nm_setting_wired_wake_on_lan_get_type (), wol);
+	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE)
+		str = g_strdup_printf ("%s", tmp && *tmp ? tmp : "none");
+	else
+		str = g_strdup_printf ("%d (%s)", wol, tmp && *tmp ? tmp : "none");
+	g_free (tmp);
+	return str;
+}
+
+static gboolean
+_set_fcn_wired_wake_on_lan (ARGS_SET_FCN)
+{
+	NMSettingWiredWakeOnLan wol;
+	gs_free char *err_token = NULL;
+	gboolean ret;
+	long int t;
+
+	if (nmc_string_to_int_base (value, 0, TRUE, 0,
+	                            NM_SETTING_WIRED_WAKE_ON_LAN_ALL
+	                            | NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS,
+	                            &t))
+		wol = (NMSettingWiredWakeOnLan) t;
+	else {
+		ret = nm_utils_enum_from_str (nm_setting_wired_wake_on_lan_get_type (), value,
+		                              (int *) &wol, &err_token);
+
+		if (!ret) {
+			if (   g_ascii_strcasecmp (err_token, "none") == 0
+			    || g_ascii_strcasecmp (err_token, "disable") == 0
+			    || g_ascii_strcasecmp (err_token, "disabled") == 0)
+				wol = NM_SETTING_WIRED_WAKE_ON_LAN_NONE;
+			else {
+				g_set_error (error, 1, 0, _("invalid option '%s', use a combination of [%s] or 'ignore', 'default' or 'none'"),
+				             err_token,
+				             nm_utils_enum_to_str (nm_setting_wired_wake_on_lan_get_type (),
+				                                   NM_SETTING_WIRED_WAKE_ON_LAN_ALL));
+				return FALSE;
+			}
+		}
+	}
+
+	if (   NM_FLAGS_ANY (wol, NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS)
+	    && !nm_utils_is_power_of_two (wol)) {
+		g_set_error_literal (error, 1, 0, _("'default' and 'ignore' are incompatible with other flags"));
+		return FALSE;
+	}
+
+	g_object_set (setting, property_info->property_name, (guint) wol, NULL);
+	return TRUE;
+}
+
+DEFINE_SETTER_MAC_BLACKLIST (_set_fcn_wired_mac_address_blacklist,
+                             NM_SETTING_WIRED,
+                             nm_setting_wired_add_mac_blacklist_item)
+
+static gboolean
+_validate_and_remove_wired_mac_blacklist_item (NMSettingWired *setting,
+                                              const char *mac,
+                                              GError **error)
+{
+	gboolean ret;
+	guint8 buf[32];
+
+	if (!nm_utils_hwaddr_aton (mac, buf, ETH_ALEN)) {
+		g_set_error (error, 1, 0, _("'%s' is not a valid MAC address"), mac);
+                return FALSE;
+	}
+
+	ret = nm_setting_wired_remove_mac_blacklist_item_by_value (setting, mac);
+	if (!ret)
+		g_set_error (error, 1, 0, _("the property doesn't contain MAC address '%s'"), mac);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_wired_mac_address_blacklist,
+                               NM_SETTING_WIRED,
+                               nm_setting_wired_get_num_mac_blacklist_items,
+                               nm_setting_wired_remove_mac_blacklist_item,
+                               _validate_and_remove_wired_mac_blacklist_item)
+
+static gboolean
+_set_fcn_wired_s390_subchannels (ARGS_SET_FCN)
+{
+	char **strv = NULL;
+	int len;
+
+	strv = nmc_strsplit_set (value, " ,\t", 0);
+	len = g_strv_length (strv);
+	if (len != 2 && len != 3) {
+		g_set_error (error, 1, 0, _("'%s' is not valid; 2 or 3 strings should be provided"),
+		             value);
+		g_strfreev (strv);
+		return FALSE;
+	}
+
+	g_object_set (setting, property_info->property_name, strv, NULL);
+	g_strfreev (strv);
+	return TRUE;
+}
+
+static const char *
+_validate_s390_option_value (const char *option, const char *value, GError **error)
+{
+	/*  nm_setting_wired_add_s390_option() requires value len in <1,199> interval */
+	if (!value || !*value || strlen (value) >= 200) {
+		g_set_error (error, 1, 0, _("'%s' string value should consist of 1 - 199 characters"), option);
+		return NULL;
+	}
+	return value;
+}
+DEFINE_SETTER_OPTIONS (_set_fcn_wired_s390_options,
+                       NM_SETTING_WIRED,
+                       NMSettingWired,
+                       nm_setting_wired_add_s390_option,
+                       nm_setting_wired_get_valid_s390_options,
+                       _validate_s390_option_value)
+DEFINE_REMOVER_OPTION (_remove_fcn_wired_s390_options,
+                       NM_SETTING_WIRED,
+                       nm_setting_wired_remove_s390_option)
+
+static const char *const*
+_values_fcn__wired_s390_options (ARGS_VALUES_FCN)
+{
+	return nm_setting_wired_get_valid_s390_options (NULL);
+}
+
+static const char *
+_describe_fcn_wired_s390_options (ARGS_DESCRIBE_FCN)
+{
+	gs_free char *options_str = NULL;
+	const char **valid_options;
+	char *s;
+
+	valid_options = nm_setting_wired_get_valid_s390_options (NULL);
+
+	options_str = g_strjoinv (", ", (char **) valid_options);
+
+	s = g_strdup_printf (_("Enter a list of S/390 options formatted as:\n"
+	                       "  option = <value>, option = <value>,...\n"
+	                       "Valid options are: %s\n"),
+	                       options_str);
+	return (*out_to_free = s);
+}
+
+
+static char *
+_get_fcn_wireless_ssid (ARGS_GET_FCN)
+{
+	NMSettingWireless *s_wireless = NM_SETTING_WIRELESS (setting);
+	GBytes *ssid;
+	char *ssid_str = NULL;
+
+	ssid = nm_setting_wireless_get_ssid (s_wireless);
+	if (ssid) {
+		ssid_str = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL),
+		                                  g_bytes_get_size (ssid));
+	}
+
+	return ssid_str;
+}
+
+static char *
+_get_fcn_wireless_powersave (ARGS_GET_FCN)
+{
+	NMSettingWireless *s_wireless = NM_SETTING_WIRELESS (setting);
+	NMSettingWirelessPowersave powersave;
+	gs_free char *str = NULL;
+	char *ret;
+
+	powersave = nm_setting_wireless_get_powersave (s_wireless);
+	str = nm_utils_enum_to_str (nm_setting_wireless_powersave_get_type (), powersave);
+
+	if (get_type == NM_META_ACCESSOR_GET_TYPE_PARSABLE) {
+		ret = str;
+		str = NULL;
+		return ret;
+	} else
+		return g_strdup_printf ("%s (%u)", str, powersave);
+}
+
+static char *
+_get_fcn_wireless_mac_address_randomization (ARGS_GET_FCN)
+{
+	NMSettingWireless *s_wifi = NM_SETTING_WIRELESS (setting);
+	NMSettingMacRandomization randomization = nm_setting_wireless_get_mac_address_randomization (s_wifi);
+
+	if (randomization == NM_SETTING_MAC_RANDOMIZATION_DEFAULT)
+		return g_strdup (_("default"));
+	else if (randomization == NM_SETTING_MAC_RANDOMIZATION_NEVER)
+		return g_strdup (_("never"));
+	else if (randomization == NM_SETTING_MAC_RANDOMIZATION_ALWAYS)
+		return g_strdup_printf (_("always"));
+	else
+		return g_strdup_printf (_("unknown"));
+}
+
+static gboolean
+_set_fcn_wireless_channel (ARGS_SET_FCN)
+{
+	unsigned long chan_int;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!nmc_string_to_uint (value, FALSE, 0, 0, &chan_int)) {
+		g_set_error (error, 1, 0, _("'%s' is not a valid channel"), value);
+		return FALSE;
+	}
+
+	if (   !nm_utils_wifi_is_channel_valid (chan_int, "a")
+	    && !nm_utils_wifi_is_channel_valid (chan_int, "bg")) {
+		g_set_error (error, 1, 0, _("'%ld' is not a valid channel"), chan_int);
+		return FALSE;
+	}
+
+	g_object_set (setting, property_info->property_name, chan_int, NULL);
+	return TRUE;
+}
+
+DEFINE_SETTER_MAC_BLACKLIST (_set_fcn_wireless_mac_address_blacklist,
+                             NM_SETTING_WIRELESS,
+                             nm_setting_wireless_add_mac_blacklist_item)
+
+static gboolean
+_validate_and_remove_wifi_mac_blacklist_item (NMSettingWireless *setting,
+                                              const char *mac,
+                                              GError **error)
+{
+	gboolean ret;
+	guint8 buf[32];
+
+	if (!nm_utils_hwaddr_aton (mac, buf, ETH_ALEN)) {
+		g_set_error (error, 1, 0, _("'%s' is not a valid MAC address"), mac);
+                return FALSE;
+	}
+
+	ret = nm_setting_wireless_remove_mac_blacklist_item_by_value (setting, mac);
+	if (!ret)
+		g_set_error (error, 1, 0, _("the property doesn't contain MAC address '%s'"), mac);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_wireless_mac_address_blacklist,
+                               NM_SETTING_WIRELESS,
+                               nm_setting_wireless_get_num_mac_blacklist_items,
+                               nm_setting_wireless_remove_mac_blacklist_item,
+                               _validate_and_remove_wifi_mac_blacklist_item)
+
+static gboolean
+_set_fcn_wireless_powersave (ARGS_SET_FCN)
+{
+	NMSettingWirelessPowersave powersave;
+	gs_free const char **options = NULL;
+	gs_free char *options_str = NULL;
+	long int t;
+	gboolean ret;
+
+	if (nmc_string_to_int_base (value, 0, TRUE,
+	                            NM_SETTING_WIRELESS_POWERSAVE_DEFAULT,
+	                            NM_SETTING_WIRELESS_POWERSAVE_LAST,
+	                            &t))
+		powersave = (NMSettingWirelessPowersave) t;
+	else {
+		ret = nm_utils_enum_from_str (nm_setting_wireless_powersave_get_type (),
+		                              value,
+		                              (int *) &powersave,
+		                              NULL);
+		if (!ret) {
+			options = nm_utils_enum_get_values (nm_setting_wireless_powersave_get_type (),
+			                                    NM_SETTING_WIRELESS_POWERSAVE_DEFAULT,
+			                                    NM_SETTING_WIRELESS_POWERSAVE_LAST);
+			options_str = g_strjoinv (",", (char **) options);
+			g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"), value, options_str);
+			return FALSE;
+		}
+	}
+
+	g_object_set (setting, property_info->property_name, (guint) powersave, NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_wireless_mac_address_randomization (ARGS_SET_FCN)
+{
+	NMSettingMacRandomization randomization;
+	gs_free char *err_token = NULL;
+	gboolean ret;
+	long int t;
+
+	if (nmc_string_to_int_base (value, 0, TRUE,
+	                            NM_SETTING_MAC_RANDOMIZATION_DEFAULT,
+	                            NM_SETTING_MAC_RANDOMIZATION_ALWAYS,
+	                            &t))
+		randomization = (NMSettingMacRandomization) t;
+	else {
+		ret = nm_utils_enum_from_str (nm_setting_mac_randomization_get_type (),
+		                              value,
+		                              (int *) &randomization,
+		                              &err_token);
+
+		if (!ret) {
+			g_set_error (error, 1, 0, _("invalid option '%s', use 'default', 'never' or 'always'"),
+			             err_token);
+			return FALSE;
+		}
+	}
+
+	g_object_set (setting, property_info->property_name, (guint) randomization, NULL);
+	return TRUE;
+}
+
+static char *
+_get_fcn_wireless_security_wep_key0 (ARGS_GET_FCN)
+{
+	NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting);
+	return g_strdup (nm_setting_wireless_security_get_wep_key (s_wireless_sec, 0));
+}
+
+static char *
+_get_fcn_wireless_security_wep_key1 (ARGS_GET_FCN)
+{
+	NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting);
+	return g_strdup (nm_setting_wireless_security_get_wep_key (s_wireless_sec, 1));
+}
+
+static char *
+_get_fcn_wireless_security_wep_key2 (ARGS_GET_FCN)
+{
+	NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting);
+	return g_strdup (nm_setting_wireless_security_get_wep_key (s_wireless_sec, 2));
+}
+
+static char *
+_get_fcn_wireless_security_wep_key3 (ARGS_GET_FCN)
+{
+	NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting);
+	return g_strdup (nm_setting_wireless_security_get_wep_key (s_wireless_sec, 3));
+}
+
+static char *
+_get_fcn_wireless_security_wep_key_type (ARGS_GET_FCN)
+{
+	return wep_key_type_to_string (nm_setting_wireless_security_get_wep_key_type (NM_SETTING_WIRELESS_SECURITY (setting)));
+}
+
+static const char *wifi_sec_valid_protos[] = { "wpa", "rsn", NULL };
+
+DEFINE_SETTER_STR_LIST_MULTI (check_and_add_wifi_sec_proto,
+                              NM_SETTING_WIRELESS_SECURITY,
+                              nm_setting_wireless_security_add_proto)
+
+static gboolean
+_set_fcn_wireless_security_proto (ARGS_SET_FCN)
+{
+	return check_and_add_wifi_sec_proto (setting, property_info->property_name, value, wifi_sec_valid_protos, error);
+}
+
+static gboolean
+_validate_and_remove_wifi_sec_proto (NMSettingWirelessSecurity *setting,
+                                     const char *proto,
+                                     GError **error)
+{
+	gboolean ret;
+	const char *valid;
+
+	valid = nmc_string_is_valid (proto, wifi_sec_valid_protos, error);
+	if (!valid)
+		return FALSE;
+
+	ret = nm_setting_wireless_security_remove_proto_by_value (setting, proto);
+	if (!ret)
+		g_set_error (error, 1, 0,
+		             _("the property doesn't contain protocol '%s'"), proto);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_wireless_security_proto,
+                               NM_SETTING_WIRELESS_SECURITY,
+                               nm_setting_wireless_security_get_num_protos,
+                               nm_setting_wireless_security_remove_proto,
+                               _validate_and_remove_wifi_sec_proto)
+
+static const char *wifi_sec_valid_pairwises[] = { "tkip", "ccmp", NULL };
+
+DEFINE_SETTER_STR_LIST_MULTI (check_and_add_wifi_sec_pairwise,
+                              NM_SETTING_WIRELESS_SECURITY,
+                              nm_setting_wireless_security_add_pairwise)
+
+static gboolean
+_set_fcn_wireless_security_pairwise (ARGS_SET_FCN)
+{
+	return check_and_add_wifi_sec_pairwise (setting, property_info->property_name, value, wifi_sec_valid_pairwises, error);
+}
+
+static gboolean
+_validate_and_remove_wifi_sec_pairwise (NMSettingWirelessSecurity *setting,
+                                        const char *pairwise,
+                                        GError **error)
+{
+	gboolean ret;
+	const char *valid;
+
+	valid = nmc_string_is_valid (pairwise, wifi_sec_valid_pairwises, error);
+	if (!valid)
+		return FALSE;
+
+	ret = nm_setting_wireless_security_remove_pairwise_by_value (setting, pairwise);
+	if (!ret)
+		g_set_error (error, 1, 0,
+		             _("the property doesn't contain protocol '%s'"), pairwise);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_wireless_security_pairwise,
+                               NM_SETTING_WIRELESS_SECURITY,
+                               nm_setting_wireless_security_get_num_pairwise,
+                               nm_setting_wireless_security_remove_pairwise,
+                               _validate_and_remove_wifi_sec_pairwise)
+
+static const char *wifi_sec_valid_groups[] = { "wep40", "wep104", "tkip", "ccmp", NULL };
+
+DEFINE_SETTER_STR_LIST_MULTI (check_and_add_wifi_sec_group,
+                              NM_SETTING_WIRELESS_SECURITY,
+                              nm_setting_wireless_security_add_group)
+
+static gboolean
+_set_fcn_wireless_security_group (ARGS_SET_FCN)
+{
+	return check_and_add_wifi_sec_group (setting, property_info->property_name, value, wifi_sec_valid_groups, error);
+}
+
+static gboolean
+_validate_and_remove_wifi_sec_group (NMSettingWirelessSecurity *setting,
+                                     const char *group,
+                                     GError **error)
+{
+	gboolean ret;
+	const char *valid;
+
+	valid = nmc_string_is_valid (group, wifi_sec_valid_groups, error);
+	if (!valid)
+		return FALSE;
+
+	ret = nm_setting_wireless_security_remove_group_by_value (setting, group);
+	if (!ret)
+		g_set_error (error, 1, 0,
+		             _("the property doesn't contain protocol '%s'"), group);
+	return ret;
+}
+DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_wireless_security_group,
+                               NM_SETTING_WIRELESS_SECURITY,
+                               nm_setting_wireless_security_get_num_groups,
+                               nm_setting_wireless_security_remove_group,
+                               _validate_and_remove_wifi_sec_group)
+
+static gboolean
+_set_fcn_wireless_wep_key (ARGS_SET_FCN)
+{
+	NMWepKeyType guessed_type = NM_WEP_KEY_TYPE_UNKNOWN;
+	NMWepKeyType type;
+	guint32 prev_idx, idx;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	/* Get currently set type */
+	type = nm_setting_wireless_security_get_wep_key_type (NM_SETTING_WIRELESS_SECURITY (setting));
+
+	/* Guess key type */
+	if (nm_utils_wep_key_valid (value, NM_WEP_KEY_TYPE_KEY))
+		guessed_type = NM_WEP_KEY_TYPE_KEY;
+	else if (nm_utils_wep_key_valid (value, NM_WEP_KEY_TYPE_PASSPHRASE))
+		guessed_type = NM_WEP_KEY_TYPE_PASSPHRASE;
+
+	if (guessed_type == NM_WEP_KEY_TYPE_UNKNOWN) {
+		g_set_error (error, 1, 0, _("'%s' is not valid"), value);
+		return FALSE;
+	}
+
+	if (type != NM_WEP_KEY_TYPE_UNKNOWN && type != guessed_type) {
+		if (nm_utils_wep_key_valid (value, type))
+			guessed_type = type;
+		else {
+			g_set_error (error, 1, 0,
+			             _("'%s' not compatible with %s '%s', please change the key or set the right %s first."),
+			             value, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, wep_key_type_to_string (type),
+			             NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE);
+			return FALSE;
+		}
+	}
+	prev_idx = nm_setting_wireless_security_get_wep_tx_keyidx (NM_SETTING_WIRELESS_SECURITY (setting));
+	idx = property_info->property_name[strlen (property_info->property_name) - 1] - '0';
+	g_print (_("WEP key is guessed to be of '%s'\n"), wep_key_type_to_string (guessed_type));
+	if (idx != prev_idx)
+		g_print (_("WEP key index set to '%d'\n"), idx);
+
+	g_object_set (setting, property_info->property_name, value, NULL);
+	g_object_set (setting, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, guessed_type, NULL);
+	if (idx != prev_idx)
+		g_object_set (setting, NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, idx, NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_wireless_security_wep_key_type (ARGS_SET_FCN)
+{
+	unsigned long  type_int;
+	const char *valid_wep_types[] = { "unknown", "key", "passphrase", NULL };
+	const char *type_str = NULL;
+	const char *key0, *key1,* key2, *key3;
+	NMWepKeyType type = NM_WEP_KEY_TYPE_UNKNOWN;
+
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	if (!nmc_string_to_uint (value, TRUE, 0, 2, &type_int)) {
+		if (!(type_str = nmc_string_is_valid (value, valid_wep_types, NULL))) {
+			g_set_error (error, 1, 0, _("'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"), value);
+			return FALSE;
+		}
+		if (type_str == valid_wep_types[1])
+			type = NM_WEP_KEY_TYPE_KEY;
+		else if (type_str == valid_wep_types[2])
+			type = NM_WEP_KEY_TYPE_PASSPHRASE;
+	} else
+		type = (NMWepKeyType) type_int;
+
+	/* Check type compatibility with set keys */
+	key0 = nm_setting_wireless_security_get_wep_key (NM_SETTING_WIRELESS_SECURITY (setting), 0);
+	key1 = nm_setting_wireless_security_get_wep_key (NM_SETTING_WIRELESS_SECURITY (setting), 1);
+	key2 = nm_setting_wireless_security_get_wep_key (NM_SETTING_WIRELESS_SECURITY (setting), 2);
+	key3 = nm_setting_wireless_security_get_wep_key (NM_SETTING_WIRELESS_SECURITY (setting), 3);
+	if (key0 && !nm_utils_wep_key_valid (key0, type))
+		g_print (_("Warning: '%s' is not compatible with '%s' type, please change or delete the key.\n"),
+		         NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, wep_key_type_to_string (type));
+	if (key1 && !nm_utils_wep_key_valid (key1, type))
+		g_print (_("Warning: '%s' is not compatible with '%s' type, please change or delete the key.\n"),
+		         NM_SETTING_WIRELESS_SECURITY_WEP_KEY1, wep_key_type_to_string (type));
+	if (key2 && !nm_utils_wep_key_valid (key2, type))
+		g_print (_("Warning: '%s' is not compatible with '%s' type, please change or delete the key.\n"),
+		         NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, wep_key_type_to_string (type));
+	if (key3 && !nm_utils_wep_key_valid (key3, type))
+		g_print (_("Warning: '%s' is not compatible with '%s' type, please change or delete the key.\n"),
+		         NM_SETTING_WIRELESS_SECURITY_WEP_KEY3, wep_key_type_to_string (type));
+
+	g_object_set (setting, property_info->property_name, type, NULL);
+	return TRUE;
+}
+
+static gboolean
+_set_fcn_wireless_security_psk (ARGS_SET_FCN)
+{
+	if (!nm_utils_wpa_psk_valid (value)) {
+		g_set_error (error, 1, 0, _("'%s' is not a valid PSK"), value);
+		return FALSE;
+	}
+	g_object_set (setting, property_info->property_name, value, NULL);
+	return TRUE;
+}
+
+/*****************************************************************************/
+
+static void
+nmc_value_transform_bool_string (const GValue *src_value,
+                                 GValue       *dest_value)
+{
+	dest_value->data[0].v_pointer = g_strdup (src_value->data[0].v_int ? "yes" : "no");
+}
+
+static void
+nmc_value_transform_char_string (const GValue *src_value,
+                                 GValue       *dest_value)
+{
+	dest_value->data[0].v_pointer = g_strdup_printf ("%c", src_value->data[0].v_uint);
+}
+
+static void __attribute__((constructor))
+register_nmcli_value_transforms (void)
+{
+	g_value_register_transform_func (G_TYPE_BOOLEAN, G_TYPE_STRING, nmc_value_transform_bool_string);
+	g_value_register_transform_func (G_TYPE_CHAR, G_TYPE_STRING, nmc_value_transform_char_string);
+}
+
+/*****************************************************************************/
+
+#define DEFINE_PROPERTY_TYPE(...) \
+	(&((NMMetaPropertyType) { __VA_ARGS__ } ))
+
+#define DEFINE_PROPERTY_TYP_DATA(...) \
+	(&((NMMetaPropertyTypData) { __VA_ARGS__ } ))
+
+#define DEFINE_PROPERTY_TYP_DATA_SUBTYPE(type, ...) \
+	DEFINE_PROPERTY_TYP_DATA ( \
+		.subtype = { .type = { __VA_ARGS__ } } , \
+	)
+
+static const NMMetaPropertyType _pt_name = {
+	.get_fcn =                      _get_fcn_name,
+};
+
+static const NMMetaPropertyType _pt_gobject_readonly = {
+	.get_fcn =                      _get_fcn_gobject,
+};
+
+static const NMMetaPropertyType _pt_gobject_string = {
+	.get_fcn =                      _get_fcn_gobject,
+	.set_fcn =                      _set_fcn_gobject_string,
+};
+
+static const NMMetaPropertyType _pt_gobject_bool = {
+	.get_fcn =                      _get_fcn_gobject,
+	.set_fcn =                      _set_fcn_gobject_bool,
+};
+
+static const NMMetaPropertyType _pt_gobject_int = {
+	.get_fcn =                      _get_fcn_gobject,
+	.set_fcn =                      _set_fcn_gobject_int,
+};
+
+static const NMMetaPropertyType _pt_gobject_int64 = {
+	.get_fcn =                      _get_fcn_gobject,
+	.set_fcn =                      _set_fcn_gobject_int64,
+};
+
+static const NMMetaPropertyType _pt_gobject_uint = {
+	.get_fcn =                      _get_fcn_gobject,
+	.set_fcn =                      _set_fcn_gobject_uint,
+};
+
+static const NMMetaPropertyType _pt_gobject_mtu = {
+	.get_fcn =                      _get_fcn_gobject_mtu,
+	.set_fcn =                      _set_fcn_gobject_mtu,
+};
+
+static const NMMetaPropertyType _pt_gobject_mac = {
+	.get_fcn =                      _get_fcn_gobject,
+	.set_fcn =                      _set_fcn_gobject_mac,
+};
+
+static const NMMetaPropertyType _pt_gobject_secret_flags = {
+	.get_fcn =                      _get_fcn_gobject_secret_flags,
+	.set_fcn =                      _set_fcn_gobject_secret_flags,
+};
+
+/*****************************************************************************/
+
+#define PROPERTY_INFO_NAME() \
+	{ \
+		.property_name =                N_ ("name"), \
+		.is_name                        = TRUE, \
+		.property_type =                &_pt_name, \
+	}
+
+#define VALUES_STATIC(...)  (((const char *[]) { __VA_ARGS__, NULL }))
+
+#define GET_FCN_WITH_DEFAULT(type, func) \
+	/* macro that returns @func as const (gboolean(*)(NMSetting*)) type, but checks
+	 * that the actual type is (gboolean(*)(type *)). */ \
+	((gboolean (*) (NMSetting *)) ((sizeof (func == ((gboolean (*) (type *)) func))) ? func : func) )
+
+#define MTU_GET_FCN(type, func) \
+	/* macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
+	 * that the actual type is (guint32(*)(type *)). */ \
+	((guint32 (*) (NMSetting *)) ((sizeof (func == ((guint32 (*) (type *)) func))) ? func : func) )
+
+#define TEAM_DESCRIBE_MESSAGE \
+	"nmcli can accepts both direct JSON configuration data and a file name containing " \
+	"the configuration. In the latter case the file is read and the contents is put " \
+	"into this property.\n\n" \
+	"Examples: set team.config " \
+	"{ \"device\": \"team0\", \"runner\": {\"name\": \"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n" \
+	"          set team.config /etc/my-team.conf\n"
+
+static const NMMetaPropertyInfo property_infos_802_1x[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_EAP),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_gobject_string,
+			.remove_fcn =               _remove_fcn_802_1x_eap,
+		),
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC ("leap", "md5", "tls", "peap", "ttls", "sim", "fast", "pwd"),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_IDENTITY),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_ANONYMOUS_IDENTITY),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PAC_FILE),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_CA_CERT),
+		.describe_message =
+		    N_ ("Enter file path to CA certificate (optionally prefixed with file://).\n"
+		        "  [file://]<file path>\n"
+		        "Note that nmcli does not support specifying certificates as raw blob data.\n"
+		        "Example: /home/cimrman/cacert.crt\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_802_1x_ca_cert,
+			.set_fcn =                  _set_fcn_802_1x_ca_cert,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_CA_CERT_PASSWORD),
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_CA_PATH),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_SUBJECT_MATCH),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_ALTSUBJECT_MATCHES),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_802_1x_altsubject_matches,
+			.remove_fcn =               _remove_fcn_802_1x_altsubject_matches,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_CLIENT_CERT),
+		.describe_message =
+		    N_ ("Enter file path to client certificate (optionally prefixed with file://).\n"
+		         "  [file://]<file path>\n"
+		         "Note that nmcli does not support specifying certificates as raw blob data.\n"
+		         "Example: /home/cimrman/jara.crt\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_802_1x_client_cert,
+			.set_fcn =                  _set_fcn_802_1x_client_cert,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_CLIENT_CERT_PASSWORD),
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE1_PEAPVER),
+		.property_type =                &_pt_gobject_string,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC ("0", "1"),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE1_PEAPLABEL),
+		.property_type =                &_pt_gobject_string,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC ("0", "1"),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING),
+		.property_type =                &_pt_gobject_string,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC ("0", "1", "2", "3"),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE1_AUTH_FLAGS),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_802_1x_phase1_auth_flags,
+			.set_fcn =                  _set_fcn_802_1x_phase1_auth_flags,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_AUTH),
+		.property_type =                &_pt_gobject_string,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC ("pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", "tls"),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_AUTHEAP),
+		.property_type =                &_pt_gobject_string,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC ("md5", "mschapv2", "otp", "gtc", "tls"),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_CA_CERT),
+		.describe_message =
+		    N_ ("Enter file path to CA certificate for inner authentication (optionally prefixed\n"
+		        "with file://).\n"
+		        "  [file://]<file path>\n"
+		        "Note that nmcli does not support specifying certificates as raw blob data.\n"
+		        "Example: /home/cimrman/ca-zweite-phase.crt\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_802_1x_phase2_ca_cert,
+			.set_fcn =                  _set_fcn_802_1x_phase2_ca_cert,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD),
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_CA_PATH),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_802_1x_phase2_altsubject_matches,
+			.remove_fcn =               _remove_fcn_802_1x_phase2_altsubject_matches,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_CLIENT_CERT),
+		.describe_message =
+		    N_ ("Enter file path to client certificate for inner authentication (optionally prefixed\n"
+		        "with file://).\n"
+		        "  [file://]<file path>\n"
+		        "Note that nmcli does not support specifying certificates as raw blob data.\n"
+		        "Example: /home/cimrman/jara-zweite-phase.crt\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_802_1x_phase2_client_cert,
+			.set_fcn =                  _set_fcn_802_1x_phase2_client_cert,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD),
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PASSWORD),
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PASSWORD_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PASSWORD_RAW),
+		.is_secret =                    TRUE,
+		.describe_message =
+		    N_ ("Enter bytes as a list of hexadecimal values.\n"
+		        "Two formats are accepted:\n"
+		        "(a) a string of hexadecimal digits, where each two digits represent one byte\n"
+		        "(b) space-separated list of bytes written as hexadecimal digits "
+		        "(with optional 0x/0X prefix, and optional leading 0).\n\n"
+		        "Examples: ab0455a6ea3a74C2\n"
+		        "          ab 4 55 0xa6 ea 3a 74 C2\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_802_1x_password_raw,
+			.set_fcn =                  _set_fcn_802_1x_password_raw,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PASSWORD_RAW_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PRIVATE_KEY),
+		.describe_message =
+		    N_ ("Enter path to a private key and the key password (if not set yet):\n"
+		        "  [file://]<file path> [<password>]\n"
+		        "Note that nmcli does not support specifying private key as raw blob data.\n"
+		        "Example: /home/cimrman/jara-priv-key Dardanely\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_802_1x_private_key,
+			.set_fcn =                  _set_fcn_802_1x_private_key,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD),
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY),
+		.describe_message =
+		    N_ ("Enter path to a private key and the key password (if not set yet):\n"
+		        "  [file://]<file path> [<password>]\n"
+		        "Note that nmcli does not support specifying private key as raw blob data.\n"
+		        "Example: /home/cimrman/jara-priv-key Dardanely\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_802_1x_phase2_private_key,
+			.set_fcn =                  _set_fcn_802_1x_phase2_private_key,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD),
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PIN),
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_PIN_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_SYSTEM_CA_CERTS),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_802_1X_AUTH_TIMEOUT),
+		.property_type =                &_pt_gobject_int,
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_adsl[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_ADSL_USERNAME),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_ADSL_PASSWORD),
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_ADSL_PASSWORD_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_ADSL_PROTOCOL),
+		.property_type =                &_pt_gobject_string,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC (NM_SETTING_ADSL_PROTOCOL_PPPOA,
+			                                           NM_SETTING_ADSL_PROTOCOL_PPPOE,
+			                                           NM_SETTING_ADSL_PROTOCOL_IPOATM),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_ADSL_ENCAPSULATION),
+		.property_type =                &_pt_gobject_string,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC (NM_SETTING_ADSL_ENCAPSULATION_VCMUX,
+			                                           NM_SETTING_ADSL_ENCAPSULATION_LLC),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_ADSL_VPI),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_ADSL_VCI),
+		.property_type =                &_pt_gobject_uint,
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_bluetooth[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_BLUETOOTH_BDADDR),
+		.property_type =                &_pt_gobject_mac,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_BLUETOOTH_TYPE),
+		.property_type =                &_pt_gobject_string,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC (NM_SETTING_BLUETOOTH_TYPE_DUN,
+			                                           NM_SETTING_BLUETOOTH_TYPE_PANU),
+		),
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_bond[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_BOND_OPTIONS),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.describe_fcn =             _describe_fcn_bond_options,
+			.get_fcn =                  _get_fcn_bond_options,
+			.set_fcn =                  _set_fcn_bond_options,
+			.remove_fcn =               _remove_fcn_bond_options,
+			.values_fcn =               _values_fcn_bond_options,
+		),
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_bridge[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_BRIDGE_MAC_ADDRESS),
+		.property_type =                &_pt_gobject_mac,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_BRIDGE_STP),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_BRIDGE_PRIORITY),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_BRIDGE_FORWARD_DELAY),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_BRIDGE_HELLO_TIME),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_BRIDGE_MAX_AGE),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_BRIDGE_AGEING_TIME),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_BRIDGE_MULTICAST_SNOOPING),
+		.property_type =                &_pt_gobject_bool,
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_bridge_port[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_BRIDGE_PORT_PRIORITY),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_BRIDGE_PORT_PATH_COST),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE),
+		.property_type =                &_pt_gobject_bool,
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_cdma[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_CDMA_NUMBER),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CDMA_USERNAME),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CDMA_PASSWORD),
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CDMA_PASSWORD_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CDMA_MTU),
+		.property_type =                &_pt_gobject_mtu,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
+			.get_fcn =                  MTU_GET_FCN (NMSettingCdma, nm_setting_cdma_get_mtu),
+		),
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_connection[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_ID),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_UUID),
+		.property_type =                DEFINE_PROPERTY_TYPE ( .get_fcn = _get_fcn_gobject ),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_STABLE_ID),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_INTERFACE_NAME),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_gobject_ifname,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_TYPE),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_connection_type,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_AUTOCONNECT),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY),
+		.property_type =                &_pt_gobject_int,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_connection_autoconnect_retires,
+			.set_fcn =                  _set_fcn_gobject_int,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_TIMESTAMP),
+		.property_type =                &_pt_gobject_readonly,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_READ_ONLY),
+		.property_type =                &_pt_gobject_readonly,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_PERMISSIONS),
+		.describe_message =
+		     N_ ("Enter a list of user permissions. This is a list of user names formatted as:\n"
+		         "  [user:]<user name 1>, [user:]<user name 2>,...\n"
+		         "The items can be separated by commas or spaces.\n\n"
+		         "Example: alice bob charlie\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_connection_permissions,
+			.set_fcn =                  _set_fcn_connection_permissions,
+			.remove_fcn =               _remove_fcn_connection_permissions,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_ZONE),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_MASTER),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_connection_master,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_SLAVE_TYPE),
+		.property_type =                &_pt_gobject_string,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC (NM_SETTING_BOND_SETTING_NAME,
+			                                           NM_SETTING_BRIDGE_SETTING_NAME,
+			                                           NM_SETTING_TEAM_SETTING_NAME),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_connection_autoconnect_slaves,
+			.set_fcn =                  _set_fcn_gobject_trilean,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_SECONDARIES),
+		.describe_message =
+		    N_ ("Enter secondary connections that should be activated when this connection is\n"
+		         "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
+		         "transparently translates names to UUIDs. Note that NetworkManager only supports\n"
+		         "VPNs as secondary connections at the moment.\n"
+		         "The items can be separated by commas or spaces.\n\n"
+		         "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_connection_secondaries,
+			.remove_fcn =               _remove_fcn_connection_secondaries,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_METERED),
+		.describe_message =
+		    N_ ("Enter a value which indicates whether the connection is subject to a data\n"
+		        "quota, usage costs or other limitations. Accepted options are:\n"
+		        "'true','yes','on' to set the connection as metered\n"
+		        "'false','no','off' to set the connection as not metered\n"
+		        "'unknown' to let NetworkManager choose a value using some heuristics\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_connection_metered,
+			.set_fcn =                  _set_fcn_connection_metered,
+		),
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC ("yes", "no", "unknown"),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_CONNECTION_LLDP),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_connection_lldp,
+			.set_fcn =                  _set_fcn_connection_lldp,
+		),
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC ("default", "disable", "enable-rx"),
+		),
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_dcb[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_DCB_APP_FCOE_FLAGS),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_dcb_app_fcoe_flags,
+			.set_fcn =                  _set_fcn_dcb_flags,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_DCB_APP_FCOE_PRIORITY),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_dcb_app_fcoe_priority,
+			.set_fcn =                  _set_fcn_dcb_priority,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_DCB_APP_FCOE_MODE),
+		.property_type =                &_pt_gobject_string,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC (NM_SETTING_DCB_FCOE_MODE_FABRIC,
+			                                           NM_SETTING_DCB_FCOE_MODE_VN2VN),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_DCB_APP_ISCSI_FLAGS),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_dcb_app_iscsi_flags,
+			.set_fcn =                  _set_fcn_dcb_flags,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_DCB_APP_ISCSI_PRIORITY),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_dcb_app_iscsi_priority,
+			.set_fcn =                  _set_fcn_dcb_priority,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_DCB_APP_FIP_FLAGS),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_dcb_app_fip_flags,
+			.set_fcn =                  _set_fcn_dcb_flags,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_DCB_APP_FIP_PRIORITY),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_dcb_app_fip_priority,
+			.set_fcn =                  _set_fcn_dcb_priority,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_dcb_priority_flow_control_flags,
+			.set_fcn =                  _set_fcn_dcb_flags,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_dcb_priority_flow_control,
+			.set_fcn =                  _set_fcn_dcb_priority_flow_control,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_DCB_PRIORITY_GROUP_FLAGS),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_dcb_priority_group_flags,
+			.set_fcn =                  _set_fcn_dcb_flags,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_DCB_PRIORITY_GROUP_ID),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_dcb_priority_group_id,
+			.set_fcn =                  _set_fcn_dcb_priority_group_id,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_dcb_priority_group_bandwidth,
+			.set_fcn =                  _set_fcn_dcb_priority_group_bandwidth,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_DCB_PRIORITY_BANDWIDTH),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_dcb_priority_bandwidth,
+			.set_fcn =                  _set_fcn_dcb_priority_bandwidth,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_dcb_priority_strict,
+			.set_fcn =                  _set_fcn_dcb_priority_strict,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_dcb_priority_traffic_class,
+			.set_fcn =                  _set_fcn_dcb_priority_traffic_class,
+		),
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_dummy[] = {
+	PROPERTY_INFO_NAME(),
+};
+
+static const NMMetaPropertyInfo property_infos_gsm[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_GSM_NUMBER),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_GSM_USERNAME),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_GSM_PASSWORD),
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_GSM_PASSWORD_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_GSM_APN),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_GSM_NETWORK_ID),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_GSM_PIN),
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_GSM_PIN_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_GSM_HOME_ONLY),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_GSM_DEVICE_ID),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_GSM_SIM_ID),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_GSM_SIM_OPERATOR_ID),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_gsm_sim_operator_id,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_GSM_MTU),
+		.property_type =                &_pt_gobject_mtu,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
+			.get_fcn =                  MTU_GET_FCN (NMSettingGsm, nm_setting_gsm_get_mtu),
+		),
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_infiniband[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_INFINIBAND_MAC_ADDRESS),
+		.property_type =                &_pt_gobject_mac,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac,
+			.mode =                     NM_META_PROPERTY_TYPE_MAC_MODE_INFINIBAND,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_INFINIBAND_MTU),
+		.property_type =                &_pt_gobject_mtu,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
+			.get_fcn =                  MTU_GET_FCN (NMSettingInfiniband, nm_setting_infiniband_get_mtu),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_INFINIBAND_TRANSPORT_MODE),
+		.property_type =                &_pt_gobject_string,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC ("datagram", "connected"),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_INFINIBAND_P_KEY),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_infiniband_p_key,
+			.set_fcn =                  _set_fcn_infiniband_p_key,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_INFINIBAND_PARENT),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_gobject_ifname,
+		),
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_ip4_config[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_METHOD),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_ip4_config_method,
+		),
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            ipv4_valid_methods,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_DNS),
+		.describe_message =
+		    N_ ("Enter a list of IPv4 addresses of DNS servers.\n\n"
+		        "Example: 8.8.8.8, 8.8.4.4\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_ip4_config_dns,
+			.remove_fcn =               _remove_fcn_ipv4_config_dns,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_DNS_SEARCH),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_ip4_config_dns_search,
+			.remove_fcn =               _remove_fcn_ipv4_config_dns_search,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_DNS_OPTIONS),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_nmc_with_default,
+			.set_fcn =                  _set_fcn_ip4_config_dns_options,
+			.remove_fcn =               _remove_fcn_ipv4_config_dns_options,
+		),
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (get_with_default,
+			.fcn =                      GET_FCN_WITH_DEFAULT (NMSettingIPConfig, nm_setting_ip_config_has_dns_options),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_DNS_PRIORITY),
+		.property_type =                &_pt_gobject_int,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_ADDRESSES),
+		.describe_message =
+		    N_ ("Enter a list of IPv4 addresses formatted as:\n"
+		        "  ip[/prefix], ip[/prefix],...\n"
+		        "Missing prefix is regarded as prefix of 32.\n\n"
+		        "Example: 192.168.1.5/24, 10.0.0.11/24\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_ip_config_addresses,
+			.set_fcn =                  _set_fcn_ip4_config_addresses,
+			.remove_fcn =               _remove_fcn_ipv4_config_addresses,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_GATEWAY),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_ip4_config_gateway,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_ROUTES),
+		.describe_message =
+		    N_ ("Enter a list of IPv4 routes formatted as:\n"
+		         "  ip[/prefix] [next-hop] [metric],...\n\n"
+		         "Missing prefix is regarded as a prefix of 32.\n"
+		         "Missing next-hop is regarded as 0.0.0.0.\n"
+		         "Missing metric means default (NM/kernel will set a default value).\n\n"
+		         "Examples: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
+		         "          10.1.2.0/24\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_ip_config_routes,
+			.set_fcn =                  _set_fcn_ip4_config_routes,
+			.remove_fcn =               _remove_fcn_ipv4_config_routes,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_ROUTE_METRIC),
+		.property_type =                &_pt_gobject_int64,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT),
+		.property_type =                &_pt_gobject_int,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP4_CONFIG_DHCP_FQDN),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_NEVER_DEFAULT),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_MAY_FAIL),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_DAD_TIMEOUT),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_ip4_config_dad_timeout,
+			.set_fcn =                  _set_fcn_gobject_int,
+		),
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_ip6_config[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_METHOD),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_ip6_config_method,
+		),
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            ipv6_valid_methods,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_DNS),
+		.describe_message =
+		    N_ ("Enter a list of IPv6 addresses of DNS servers.  If the IPv6 "
+		        "configuration method is 'auto' these DNS servers are appended "
+		        "to those (if any) returned by automatic configuration.  DNS "
+		        "servers cannot be used with the 'shared' or 'link-local' IPv6 "
+		        "configuration methods, as there is no upstream network. In "
+		        "all other IPv6 configuration methods, these DNS "
+		        "servers are used as the only DNS servers for this connection.\n\n"
+		        "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_ip6_config_dns,
+			.remove_fcn =               _remove_fcn_ipv6_config_dns,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_DNS_SEARCH),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_ip6_config_dns_search,
+			.remove_fcn =               _remove_fcn_ipv6_config_dns_search,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_DNS_OPTIONS),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_nmc_with_default,
+			.set_fcn =                  _set_fcn_ip6_config_dns_options,
+			.remove_fcn =               _remove_fcn_ipv6_config_dns_options,
+		),
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (get_with_default,
+			.fcn =     GET_FCN_WITH_DEFAULT (NMSettingIPConfig, nm_setting_ip_config_has_dns_options),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_DNS_PRIORITY),
+		.property_type =                &_pt_gobject_int,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_ADDRESSES),
+		.describe_message =
+		    N_ ("Enter a list of IPv6 addresses formatted as:\n"
+		        "  ip[/prefix], ip[/prefix],...\n"
+		        "Missing prefix is regarded as prefix of 128.\n\n"
+		        "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_ip_config_addresses,
+			.set_fcn =                  _set_fcn_ip6_config_addresses,
+			.remove_fcn =               _remove_fcn_ipv6_config_addresses,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_GATEWAY),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_ip6_config_gateway,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_ROUTES),
+		.describe_message =
+		    N_ ("Enter a list of IPv6 routes formatted as:\n"
+		        "  ip[/prefix] [next-hop] [metric],...\n\n"
+		        "Missing prefix is regarded as a prefix of 128.\n"
+		        "Missing next-hop is regarded as \"::\".\n"
+		        "Missing metric means default (NM/kernel will set a default value).\n\n"
+		         "Examples: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef::3 2\n"
+		        "          abbe::/64 55\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_ip_config_routes,
+			.set_fcn =                  _set_fcn_ip6_config_routes,
+			.remove_fcn =               _remove_fcn_ipv6_config_routes,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_ROUTE_METRIC),
+		.property_type =                &_pt_gobject_int64,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_NEVER_DEFAULT),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_MAY_FAIL),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP6_CONFIG_IP6_PRIVACY),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_ip6_config_ip6_privacy,
+			.set_fcn =                  _set_fcn_ip6_config_ip6_privacy,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_ip6_config_addr_gen_mode,
+			.set_fcn =                  _set_fcn_ip6_config_addr_gen_mode,
+			.values_fcn =               _values_fcn_gobject_enum,
+		),
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+			.get_gtype =                nm_setting_ip6_config_addr_gen_mode_get_type,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP6_CONFIG_TOKEN),
+		.property_type =                &_pt_gobject_string,
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_ip_tunnel[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_IP_TUNNEL_MODE),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_ip_tunnel_mode,
+			.set_fcn =                  _set_fcn_ip_tunnel_mode,
+			.values_fcn =               _values_fcn_gobject_enum,
+		),
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+			.get_gtype =        nm_ip_tunnel_mode_get_type,
+			.min =              NM_IP_TUNNEL_MODE_UNKNOWN + 1,
+			.max =              G_MAXINT,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_TUNNEL_PARENT),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_TUNNEL_LOCAL),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_TUNNEL_REMOTE),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_TUNNEL_TTL),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_TUNNEL_TOS),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_TUNNEL_INPUT_KEY),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_TUNNEL_OUTPUT_KEY),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_TUNNEL_FLOW_LABEL),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_IP_TUNNEL_MTU),
+		.property_type =                &_pt_gobject_mtu,
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_macsec[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_MACSEC_PARENT),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_MACSEC_MODE),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_macsec_mode,
+			.set_fcn =                  _set_fcn_macsec_mode,
+			.values_fcn =               _values_fcn_gobject_enum,
+		),
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+			.get_gtype =        nm_setting_macsec_mode_get_type,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_MACSEC_ENCRYPT),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_MACSEC_MKA_CAK),
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_MACSEC_MKA_CAK_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_MACSEC_MKA_CKN),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_MACSEC_PORT),
+		.property_type =                &_pt_gobject_int,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_MACSEC_VALIDATION),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_macsec_validation,
+			.set_fcn =                  _set_fcn_macsec_validation,
+			.values_fcn =               _values_fcn_gobject_enum,
+		),
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+			.get_gtype =        nm_setting_macsec_validation_get_type,
+		),
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_macvlan[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_MACVLAN_PARENT),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_MACVLAN_MODE),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_macvlan_mode,
+			.set_fcn =                  _set_fcn_macvlan_mode,
+			.values_fcn =               _values_fcn_gobject_enum,
+		),
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+			.get_gtype =        nm_setting_macvlan_mode_get_type,
+			.min =              NM_SETTING_MACVLAN_MODE_UNKNOWN + 1,
+			.max =              G_MAXINT,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_MACVLAN_PROMISCUOUS),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_MACVLAN_TAP),
+		.property_type =                &_pt_gobject_bool,
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_olpc_mesh[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_OLPC_MESH_SSID),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_olpc_mesh_ssid,
+			.set_fcn =                  _set_fcn_gobject_ssid,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_OLPC_MESH_CHANNEL),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_olpc_mesh_channel,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS),
+		.property_type =                &_pt_gobject_mac,
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_pppoe[] = {
+	PROPERTY_INFO_NAME (),
+	{
+		.property_name =                N_ (NM_SETTING_PPPOE_SERVICE),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPPOE_USERNAME),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPPOE_PASSWORD),
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPPOE_PASSWORD_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_ppp[] = {
+	PROPERTY_INFO_NAME (),
+	{
+		.property_name =                N_ (NM_SETTING_PPP_NOAUTH),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPP_REFUSE_EAP),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPP_REFUSE_PAP),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPP_REFUSE_CHAP),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPP_REFUSE_MSCHAP),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPP_REFUSE_MSCHAPV2),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPP_NOBSDCOMP),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPP_NODEFLATE),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPP_NO_VJ_COMP),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPP_REQUIRE_MPPE),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPP_REQUIRE_MPPE_128),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPP_MPPE_STATEFUL),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPP_CRTSCTS),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPP_BAUD),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPP_MRU),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPP_MTU),
+		.property_type =                &_pt_gobject_mtu,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
+			.get_fcn =                  MTU_GET_FCN (NMSettingPpp, nm_setting_ppp_get_mtu),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPP_LCP_ECHO_FAILURE),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PPP_LCP_ECHO_INTERVAL),
+		.property_type =                &_pt_gobject_uint,
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_proxy[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_PROXY_METHOD),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_proxy_method,
+			.set_fcn =                  _set_fcn_proxy_method,
+			.values_fcn =               _values_fcn_gobject_enum,
+		),
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+			.get_gtype =        nm_setting_proxy_method_get_type,
+			.min =              NM_SETTING_PROXY_METHOD_NONE,
+			.max =              G_MAXINT,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PROXY_BROWSER_ONLY),
+		.property_type =                &_pt_gobject_bool
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PROXY_PAC_URL),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_PROXY_PAC_SCRIPT),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_proxy_pac_script,
+		),
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_team[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_TEAM_CONFIG),
+		.describe_message =             N_ (TEAM_DESCRIBE_MESSAGE),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_team_config,
+		),
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_team_port[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_TEAM_PORT_CONFIG),
+		.describe_message =             N_ (TEAM_DESCRIBE_MESSAGE),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_team_config,
+		),
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_tun[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_TUN_MODE),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_tun_mode,
+			.set_fcn =                  _set_fcn_tun_mode,
+		),
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC ("tun", "tap", "unknown"),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_TUN_OWNER),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_TUN_GROUP),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_TUN_PI),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_TUN_VNET_HDR),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_TUN_MULTI_QUEUE),
+		.property_type =                &_pt_gobject_bool,
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_serial[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_SERIAL_BAUD),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_SERIAL_BITS),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_SERIAL_PARITY),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_serial_parity,
+			.set_fcn =                  _set_fcn_serial_parity,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_SERIAL_STOPBITS),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_SERIAL_SEND_DELAY),
+		.property_type =                &_pt_gobject_uint,
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_vlan[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_VLAN_PARENT),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VLAN_ID),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VLAN_FLAGS),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_vlan_flags,
+			.set_fcn =                  _set_fcn_gobject_flags,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VLAN_INGRESS_PRIORITY_MAP),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_vlan_ingress_priority_map,
+			.set_fcn =                  _set_fcn_vlan_ingress_priority_map,
+			.remove_fcn =               _remove_fcn_vlan_ingress_priority_map,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VLAN_EGRESS_PRIORITY_MAP),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_vlan_egress_priority_map,
+			.set_fcn =                  _set_fcn_vlan_egress_priority_map,
+			.remove_fcn =               _remove_fcn_vlan_egress_priority_map,
+		),
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_vpn[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_VPN_SERVICE_TYPE),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_vpn_service_type,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VPN_USER_NAME),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VPN_DATA),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_vpn_data,
+			.set_fcn =                  _set_fcn_vpn_data,
+			.remove_fcn =               _remove_fcn_vpn_data,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VPN_SECRETS),
+		.is_secret =                    TRUE,
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_vpn_secrets,
+			.set_fcn =                  _set_fcn_vpn_secrets,
+			.remove_fcn =               _remove_fcn_vpn_secrets,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VPN_PERSISTENT),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VPN_TIMEOUT),
+		.property_type =                &_pt_gobject_uint,
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_vxlan[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_VXLAN_PARENT),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VXLAN_ID),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VXLAN_LOCAL),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VXLAN_REMOTE),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VXLAN_SOURCE_PORT_MIN),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VXLAN_SOURCE_PORT_MAX),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VXLAN_DESTINATION_PORT),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VXLAN_TOS),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VXLAN_TTL),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VXLAN_AGEING),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VXLAN_LIMIT),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VXLAN_LEARNING),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VXLAN_PROXY),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VXLAN_RSC),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VXLAN_L2_MISS),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_VXLAN_L3_MISS),
+		.property_type =                &_pt_gobject_bool,
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_wimax[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_WIMAX_MAC_ADDRESS),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIMAX_NETWORK_NAME),
+		.property_type =                &_pt_gobject_mac,
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_wired[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_WIRED_PORT),
+		/* Do not allow setting 'port' for now. It is not implemented in
+		 * NM core, nor in ifcfg-rh plugin. Enable this when it gets done.
+		 * wired_valid_ports[] = { "tp", "aui", "bnc", "mii", NULL };
+		 */
+		.property_type =                &_pt_gobject_readonly,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRED_SPEED),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRED_DUPLEX),
+		.property_type =                &_pt_gobject_string,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC ("half", "full"),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRED_AUTO_NEGOTIATE),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRED_MAC_ADDRESS),
+		.property_type =                &_pt_gobject_mac,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRED_CLONED_MAC_ADDRESS),
+		.property_type =                &_pt_gobject_mac,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac,
+			.mode =                     NM_META_PROPERTY_TYPE_MAC_MODE_CLONED,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_wired_mac_address_blacklist,
+			.remove_fcn =               _remove_fcn_wired_mac_address_blacklist,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRED_MTU),
+		.property_type =                &_pt_gobject_mtu,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
+			.get_fcn =                  MTU_GET_FCN (NMSettingWired, nm_setting_wired_get_mtu),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRED_S390_SUBCHANNELS),
+		.describe_message =
+		    N_ ("Enter a list of subchannels (comma or space separated).\n\n"
+		        "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_wired_s390_subchannels,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRED_S390_NETTYPE),
+		.property_type =                &_pt_gobject_string,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC ("qeth", "lcs", "ctc"),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRED_S390_OPTIONS),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.describe_fcn =             _describe_fcn_wired_s390_options,
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_wired_s390_options,
+			.remove_fcn =               _remove_fcn_wired_s390_options,
+			.values_fcn =               _values_fcn__wired_s390_options,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRED_WAKE_ON_LAN),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_wired_wake_on_lan,
+			.set_fcn =                  _set_fcn_wired_wake_on_lan,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD),
+		.property_type =                &_pt_gobject_mac,
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_wireless[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SSID),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_wireless_ssid,
+			.set_fcn =                  _set_fcn_gobject_ssid,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_MODE),
+		.property_type =                &_pt_gobject_string,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC (NM_SETTING_WIRELESS_MODE_INFRA,
+			                                           NM_SETTING_WIRELESS_MODE_ADHOC,
+			                                           NM_SETTING_WIRELESS_MODE_AP),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_BAND),
+		.property_type =                &_pt_gobject_string,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC ("a", "bg"),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_CHANNEL),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_wireless_channel,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_BSSID),
+		.property_type =                &_pt_gobject_mac,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_RATE),
+		/* Do not allow setting 'rate'. It is not implemented in NM core. */
+		.property_type =                &_pt_gobject_readonly,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_TX_POWER),
+		/* Do not allow setting 'tx-power'. It is not implemented in NM core. */
+		.property_type =                &_pt_gobject_readonly,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_MAC_ADDRESS),
+		.property_type =                &_pt_gobject_mac,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS),
+		.property_type =                &_pt_gobject_mac,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac,
+			.mode =                     NM_META_PROPERTY_TYPE_MAC_MODE_CLONED,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_wireless_mac_address_blacklist,
+			.remove_fcn =               _remove_fcn_wireless_mac_address_blacklist,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_wireless_mac_address_randomization,
+			.set_fcn =                  _set_fcn_wireless_mac_address_randomization,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_MTU),
+		.property_type =                &_pt_gobject_mtu,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
+			.get_fcn =                  MTU_GET_FCN (NMSettingWireless, nm_setting_wireless_get_mtu),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SEEN_BSSIDS),
+		.property_type =                &_pt_gobject_readonly,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_HIDDEN),
+		.property_type =                &_pt_gobject_bool,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_POWERSAVE),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_wireless_powersave,
+			.set_fcn =                  _set_fcn_wireless_powersave,
+		),
+	},
+};
+
+static const NMMetaPropertyInfo property_infos_wireless_security[] = {
+	PROPERTY_INFO_NAME(),
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT),
+		.property_type =                &_pt_gobject_string,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC ("none", "ieee8021x", "wpa-none", "wpa-psk", "wpa-eap"),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX),
+		.property_type =                &_pt_gobject_uint,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_AUTH_ALG),
+		.property_type =                &_pt_gobject_string,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            VALUES_STATIC ("open", "shared", "leap"),
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_PROTO),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_wireless_security_proto,
+			.remove_fcn =               _remove_fcn_wireless_security_proto,
+		),
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            wifi_sec_valid_protos,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_PAIRWISE),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_wireless_security_pairwise,
+			.remove_fcn =               _remove_fcn_wireless_security_pairwise,
+		),
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            wifi_sec_valid_pairwises,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_GROUP),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_wireless_security_group,
+			.remove_fcn =               _remove_fcn_wireless_security_group,
+		),
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			.values_static =            wifi_sec_valid_groups,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME),
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY0),
+		.is_secret =                    TRUE,
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_wireless_security_wep_key0,
+			.set_fcn =                  _set_fcn_wireless_wep_key,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY1),
+		.is_secret =                    TRUE,
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_wireless_security_wep_key1,
+			.set_fcn =                  _set_fcn_wireless_wep_key,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY2),
+		.is_secret =                    TRUE,
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_wireless_security_wep_key2,
+			.set_fcn =                  _set_fcn_wireless_wep_key,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY3),
+		.is_secret =                    TRUE,
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_wireless_security_wep_key3,
+			.set_fcn =                  _set_fcn_wireless_wep_key,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE),
+		.describe_message =
+		    N_ ("Enter the type of WEP keys. The accepted values are: "
+		        "0 or unknown, 1 or key, and 2 or passphrase.\n"),
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_wireless_security_wep_key_type,
+			.set_fcn =                  _set_fcn_wireless_security_wep_key_type,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_PSK),
+		.is_secret =                    TRUE,
+		.property_type = DEFINE_PROPERTY_TYPE (
+			.get_fcn =                  _get_fcn_gobject,
+			.set_fcn =                  _set_fcn_wireless_security_psk,
+		),
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD),
+		.is_secret =                    TRUE,
+		.property_type =                &_pt_gobject_string,
+	},
+	{
+		.property_name =                N_ (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS),
+		.property_type =                &_pt_gobject_secret_flags,
+	},
+};
+
+const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[_NM_META_SETTING_TYPE_NUM] = {
+	[NM_META_SETTING_TYPE_802_1X] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_802_1X],
+		.properties                         = property_infos_802_1x,
+		.properties_num                     = G_N_ELEMENTS (property_infos_802_1x),
+	},
+	[NM_META_SETTING_TYPE_ADSL] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_ADSL],
+		.properties                         = property_infos_adsl,
+		.properties_num                     = G_N_ELEMENTS (property_infos_adsl),
+	},
+	[NM_META_SETTING_TYPE_BLUETOOTH] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_BLUETOOTH],
+		.properties                         = property_infos_bluetooth,
+		.properties_num                     = G_N_ELEMENTS (property_infos_bluetooth),
+	},
+	[NM_META_SETTING_TYPE_BOND] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_BOND],
+		.properties                         = property_infos_bond,
+		.properties_num                     = G_N_ELEMENTS (property_infos_bond),
+	},
+	[NM_META_SETTING_TYPE_BRIDGE] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_BRIDGE],
+		.properties                         = property_infos_bridge,
+		.properties_num                     = G_N_ELEMENTS (property_infos_bridge),
+	},
+	[NM_META_SETTING_TYPE_BRIDGE_PORT] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_BRIDGE_PORT],
+		.properties                         = property_infos_bridge_port,
+		.properties_num                     = G_N_ELEMENTS (property_infos_bridge_port),
+	},
+	[NM_META_SETTING_TYPE_CDMA] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_CDMA],
+		.properties                         = property_infos_cdma,
+		.properties_num                     = G_N_ELEMENTS (property_infos_cdma),
+	},
+	[NM_META_SETTING_TYPE_CONNECTION] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_CONNECTION],
+		.properties                         = property_infos_connection,
+		.properties_num                     = G_N_ELEMENTS (property_infos_connection),
+	},
+	[NM_META_SETTING_TYPE_DCB] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_DCB],
+		.properties                         = property_infos_dcb,
+		.properties_num                     = G_N_ELEMENTS (property_infos_dcb),
+	},
+	[NM_META_SETTING_TYPE_DUMMY] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_DUMMY],
+		.properties                         = property_infos_dummy,
+		.properties_num                     = G_N_ELEMENTS (property_infos_dummy),
+	},
+	[NM_META_SETTING_TYPE_GSM] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_GSM],
+		.properties                         = property_infos_gsm,
+		.properties_num                     = G_N_ELEMENTS (property_infos_gsm),
+	},
+	[NM_META_SETTING_TYPE_INFINIBAND] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_INFINIBAND],
+		.properties                         = property_infos_infiniband,
+		.properties_num                     = G_N_ELEMENTS (property_infos_infiniband),
+	},
+	[NM_META_SETTING_TYPE_IP4_CONFIG] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_IP4_CONFIG],
+		.properties                         = property_infos_ip4_config,
+		.properties_num                     = G_N_ELEMENTS (property_infos_ip4_config),
+	},
+	[NM_META_SETTING_TYPE_IP6_CONFIG] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_IP6_CONFIG],
+		.properties                         = property_infos_ip6_config,
+		.properties_num                     = G_N_ELEMENTS (property_infos_ip6_config),
+	},
+	[NM_META_SETTING_TYPE_IP_TUNNEL] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_IP_TUNNEL],
+		.properties                         = property_infos_ip_tunnel,
+		.properties_num                     = G_N_ELEMENTS (property_infos_ip_tunnel),
+	},
+	[NM_META_SETTING_TYPE_MACSEC] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_MACSEC],
+		.properties                         = property_infos_macsec,
+		.properties_num                     = G_N_ELEMENTS (property_infos_macsec),
+	},
+	[NM_META_SETTING_TYPE_MACVLAN] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_MACVLAN],
+		.properties                         = property_infos_macvlan,
+		.properties_num                     = G_N_ELEMENTS (property_infos_macvlan),
+	},
+	[NM_META_SETTING_TYPE_OLPC_MESH] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_OLPC_MESH],
+		.properties                         = property_infos_olpc_mesh,
+		.properties_num                     = G_N_ELEMENTS (property_infos_olpc_mesh),
+	},
+	[NM_META_SETTING_TYPE_PPPOE] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_PPPOE],
+		.properties                         = property_infos_pppoe,
+		.properties_num                     = G_N_ELEMENTS (property_infos_pppoe),
+	},
+	[NM_META_SETTING_TYPE_PPP] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_PPP],
+		.properties                         = property_infos_ppp,
+		.properties_num                     = G_N_ELEMENTS (property_infos_ppp),
+	},
+	[NM_META_SETTING_TYPE_PROXY] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_PROXY],
+		.properties                         = property_infos_proxy,
+		.properties_num                     = G_N_ELEMENTS (property_infos_proxy),
+	},
+	[NM_META_SETTING_TYPE_SERIAL] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_SERIAL],
+		.properties                         = property_infos_serial,
+		.properties_num                     = G_N_ELEMENTS (property_infos_serial),
+	},
+	[NM_META_SETTING_TYPE_TEAM] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_TEAM],
+		.properties                         = property_infos_team,
+		.properties_num                     = G_N_ELEMENTS (property_infos_team),
+	},
+	[NM_META_SETTING_TYPE_TEAM_PORT] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_TEAM_PORT],
+		.properties                         = property_infos_team_port,
+		.properties_num                     = G_N_ELEMENTS (property_infos_team_port),
+	},
+	[NM_META_SETTING_TYPE_TUN] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_TUN],
+		.properties                         = property_infos_tun,
+		.properties_num                     = G_N_ELEMENTS (property_infos_tun),
+	},
+	[NM_META_SETTING_TYPE_VLAN] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_VLAN],
+		.properties                         = property_infos_vlan,
+		.properties_num                     = G_N_ELEMENTS (property_infos_vlan),
+	},
+	[NM_META_SETTING_TYPE_VPN] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_VPN],
+		.properties                         = property_infos_vpn,
+		.properties_num                     = G_N_ELEMENTS (property_infos_vpn),
+	},
+	[NM_META_SETTING_TYPE_VXLAN] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_VXLAN],
+		.properties                         = property_infos_vxlan,
+		.properties_num                     = G_N_ELEMENTS (property_infos_vxlan),
+	},
+	[NM_META_SETTING_TYPE_WIMAX] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_WIMAX],
+		.properties                         = property_infos_wimax,
+		.properties_num                     = G_N_ELEMENTS (property_infos_wimax),
+	},
+	[NM_META_SETTING_TYPE_WIRED] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_WIRED],
+		.properties                         = property_infos_wired,
+		.properties_num                     = G_N_ELEMENTS (property_infos_wired),
+	},
+	[NM_META_SETTING_TYPE_WIRELESS] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_WIRELESS],
+		.properties                         = property_infos_wireless,
+		.properties_num                     = G_N_ELEMENTS (property_infos_wireless),
+	},
+	[NM_META_SETTING_TYPE_WIRELESS_SECURITY] = {
+		.general                            = &nm_meta_setting_infos[NM_META_SETTING_TYPE_WIRELESS_SECURITY],
+		.properties                         = property_infos_wireless_security,
+		.properties_num                     = G_N_ELEMENTS (property_infos_wireless_security),
+	},
+};
diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h
new file mode 100644
index 0000000000..58b20e409f
--- /dev/null
+++ b/clients/common/nm-meta-setting-desc.h
@@ -0,0 +1,118 @@
+/* nmcli - command-line tool to control NetworkManager
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2010 - 2017 Red Hat, Inc.
+ */
+
+#ifndef __NM_META_SETTING_DESC_H__
+#define __NM_META_SETTING_DESC_H__
+
+#include "nm-meta-setting.h"
+
+#define NM_META_TEXT_HIDDEN "<hidden>"
+
+typedef enum {
+	NM_META_ACCESSOR_GET_TYPE_PRETTY,
+	NM_META_ACCESSOR_GET_TYPE_PARSABLE,
+} NMMetaAccessorGetType;
+
+typedef enum {
+	NM_META_PROPERTY_TYPE_MAC_MODE_DEFAULT,
+	NM_META_PROPERTY_TYPE_MAC_MODE_CLONED,
+	NM_META_PROPERTY_TYPE_MAC_MODE_INFINIBAND,
+} NMMetaPropertyTypeMacMode;
+
+typedef struct _NMMetaSettingInfoEditor     NMMetaSettingInfoEditor;
+typedef struct _NMMetaPropertyInfo    NMMetaPropertyInfo;
+typedef struct _NMMetaPropertyType    NMMetaPropertyType;
+typedef struct _NMMetaPropertyTypData NMMetaPropertyTypData;
+
+struct _NMMetaPropertyType {
+
+	const char *(*describe_fcn) (const NMMetaSettingInfoEditor *setting_info,
+	                             const NMMetaPropertyInfo *property_info,
+	                             char **out_to_free);
+
+	char *(*get_fcn) (const NMMetaSettingInfoEditor *setting_info,
+	                  const NMMetaPropertyInfo *property_info,
+	                  NMSetting *setting,
+	                  NMMetaAccessorGetType get_type,
+	                  gboolean show_secrets);
+	gboolean (*set_fcn) (const NMMetaSettingInfoEditor *setting_info,
+	                     const NMMetaPropertyInfo *property_info,
+	                     NMSetting *setting,
+	                     const char *value,
+	                     GError **error);
+	gboolean (*remove_fcn) (const NMMetaSettingInfoEditor *setting_info,
+	                        const NMMetaPropertyInfo *property_info,
+	                        NMSetting *setting,
+	                        const char *option,
+	                        guint32 idx,
+	                        GError **error);
+
+	const char *const*(*values_fcn) (const NMMetaSettingInfoEditor *setting_info,
+	                                 const NMMetaPropertyInfo *property_info,
+	                                 char ***out_to_free);
+};
+
+struct _NMMetaPropertyTypData {
+	union {
+		struct {
+			gboolean (*fcn) (NMSetting *setting);
+		} get_with_default;
+		struct {
+			GType (*get_gtype) (void);
+			int min;
+			int max;
+		} gobject_enum;
+		struct {
+			guint32 (*get_fcn) (NMSetting *setting);
+		} mtu;
+		struct {
+			NMMetaPropertyTypeMacMode mode;
+		} mac;
+	} subtype;
+	const char *const*values_static;
+};
+
+struct _NMMetaPropertyInfo {
+	const char *property_name;
+
+	/* the property list for now must contain as first field the
+	 * "name", which isn't a regular property. This is required by
+	 * NmcOutputField and this first field is ignored for the
+	 * group_list/setting_info. */
+	bool is_name:1;
+
+	bool is_secret:1;
+
+	const char *describe_message;
+
+	const NMMetaPropertyType    *property_type;
+	const NMMetaPropertyTypData *property_typ_data;
+};
+
+struct _NMMetaSettingInfoEditor {
+	const NMMetaSettingInfo *general;
+	/* the order of the properties matter. The first *must* be the
+	 * "name", and then the order is as they are listed by default. */
+	const NMMetaPropertyInfo *properties;
+	guint properties_num;
+};
+
+extern const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[_NM_META_SETTING_TYPE_NUM];
+
+#endif /* __NM_META_SETTING_DESC_H__ */
diff --git a/libnm-core/nm-keyfile-internal.h b/libnm-core/nm-keyfile-internal.h
index be11a70807..5b709c025f 100644
--- a/libnm-core/nm-keyfile-internal.h
+++ b/libnm-core/nm-keyfile-internal.h
@@ -28,7 +28,7 @@
 #include "nm-setting-8021x.h"
 
 #include "nm-core-internal.h"
-#include "nm-setting-metadata.h"
+#include "nm-meta-setting.h"
 
 /*****************************************************************************/
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0a0d9b65f2..d72566c93a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,6 +10,7 @@ clients/cli/nmcli.c
 clients/cli/polkit-agent.c
 clients/cli/settings.c
 clients/cli/utils.c
+clients/common/nm-meta-setting-desc.c
 clients/common/nm-polkit-listener.c
 clients/common/nm-secret-agent-simple.c
 clients/common/nm-vpn-helpers.c
diff --git a/shared/nm-setting-metadata.c b/shared/nm-meta-setting.c
similarity index 99%
rename from shared/nm-setting-metadata.c
rename to shared/nm-meta-setting.c
index 735f90fe1e..58bd3f1004 100644
--- a/shared/nm-setting-metadata.c
+++ b/shared/nm-meta-setting.c
@@ -21,7 +21,7 @@
 
 #include "nm-default.h"
 
-#include "nm-setting-metadata.h"
+#include "nm-meta-setting.h"
 
 #include "nm-setting-8021x.h"
 #include "nm-setting-adsl.h"
diff --git a/shared/nm-setting-metadata.h b/shared/nm-meta-setting.h
similarity index 97%
rename from shared/nm-setting-metadata.h
rename to shared/nm-meta-setting.h
index 57ef52575f..3d78a85045 100644
--- a/shared/nm-setting-metadata.h
+++ b/shared/nm-meta-setting.h
@@ -19,8 +19,8 @@
  * Copyright 2017 Red Hat, Inc.
  */
 
-#ifndef __NM_SETTING_METADATA_H__
-#define __NM_SETTING_METADATA_H__
+#ifndef __NM_META_SETTING_H__
+#define __NM_META_SETTING_H__
 
 #include "nm-setting-8021x.h"
 
@@ -108,4 +108,4 @@ const NMMetaSettingInfo *nm_meta_setting_infos_by_gtype (GType gtype);
 
 /*****************************************************************************/
 
-#endif /* __NM_SETTING_METADATA_H__ */
+#endif /* __NM_META_SETTING_H__ */
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index 8129f5cc13..01e666356e 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -47,7 +47,7 @@
 #include "nm-utils.h"
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
-#include "nm-setting-metadata.h"
+#include "nm-meta-setting.h"
 
 #include "nms-ifcfg-rh-common.h"
 #include "nms-ifcfg-rh-reader.h"
diff --git a/src/settings/plugins/ifnet/nms-ifnet-connection-parser.c b/src/settings/plugins/ifnet/nms-ifnet-connection-parser.c
index c5129fea40..ed0a757fdb 100644
--- a/src/settings/plugins/ifnet/nms-ifnet-connection-parser.c
+++ b/src/settings/plugins/ifnet/nms-ifnet-connection-parser.c
@@ -31,7 +31,7 @@
 #include "settings/nm-settings-plugin.h"
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
-#include "nm-setting-metadata.h"
+#include "nm-meta-setting.h"
 
 #include "nms-ifnet-net-utils.h"
 #include "nms-ifnet-wpa-parser.h"