summary refs log tree commit diff
path: root/clients/cli/settings.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2017-11-07 00:14:39 +0100
committerMichael Biebl <biebl@debian.org>2017-11-07 00:14:39 +0100
commit90e8691111889a7b5f3c812f5a41f15a8a058913 (patch)
treef101a879eca27c34a9bfa5f3da52266b22539a36 /clients/cli/settings.c
parentbdb6eeb0670658255c2a4c3c501c0a27fa8cfe55 (diff)
New upstream version 1.9.90 upstream/1.9.90
Diffstat (limited to 'clients/cli/settings.c')
-rw-r--r--clients/cli/settings.c9628
1 files changed, 261 insertions, 9367 deletions
diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index e0f045ac..e0db1b5b 100644
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -25,5793 +25,15 @@
 #include <arpa/inet.h>
 
 #include "nm-common-macros.h"
-#include "utils.h"
-#include "common.h"
-#include "nm-vpn-helpers.h"
-
-/* Forward declarations */
-static char *wep_key_type_to_string (NMWepKeyType type);
-
-typedef enum {
-	NMC_PROPERTY_GET_PRETTY,
-	NMC_PROPERTY_GET_PARSABLE,
-} NmcPropertyGetType;
-
-/* Helper macro to define fields */
-#define SETTING_FIELD(setting) { setting, N_(setting), 0, NULL, FALSE, FALSE, 0 }
-
-/* Available fields for NM_SETTING_CONNECTION_SETTING_NAME */
-NmcOutputField nmc_fields_setting_connection[] = {
-	SETTING_FIELD ("name"),                                      /* 0 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_ID),                    /* 1 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_UUID),                  /* 2 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_STABLE_ID),             /* 3 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_INTERFACE_NAME),        /* 4 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_TYPE),                  /* 5 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_AUTOCONNECT),           /* 6 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY),  /* 7 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES),   /* 8 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_TIMESTAMP),             /* 9 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_READ_ONLY),             /* 10 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_PERMISSIONS),           /* 11 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_ZONE),                  /* 12 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_MASTER),                /* 13 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_SLAVE_TYPE),            /* 14 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES),    /* 15 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_SECONDARIES),           /* 16 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT),  /* 17 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_METERED),               /* 18 */
-	SETTING_FIELD (NM_SETTING_CONNECTION_LLDP),                  /* 19 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_CONNECTION_ALL     "name"","\
-                                              NM_SETTING_CONNECTION_ID","\
-                                              NM_SETTING_CONNECTION_UUID","\
-                                              NM_SETTING_CONNECTION_STABLE_ID","\
-                                              NM_SETTING_CONNECTION_INTERFACE_NAME","\
-                                              NM_SETTING_CONNECTION_TYPE","\
-                                              NM_SETTING_CONNECTION_AUTOCONNECT","\
-                                              NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY","\
-                                              NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES","\
-                                              NM_SETTING_CONNECTION_TIMESTAMP","\
-                                              NM_SETTING_CONNECTION_READ_ONLY","\
-                                              NM_SETTING_CONNECTION_PERMISSIONS","\
-                                              NM_SETTING_CONNECTION_ZONE","\
-                                              NM_SETTING_CONNECTION_MASTER","\
-                                              NM_SETTING_CONNECTION_SLAVE_TYPE","\
-                                              NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES","\
-                                              NM_SETTING_CONNECTION_SECONDARIES","\
-                                              NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT","\
-                                              NM_SETTING_CONNECTION_METERED","\
-                                              NM_SETTING_CONNECTION_LLDP
-
-/* Available fields for NM_SETTING_WIRED_SETTING_NAME */
-NmcOutputField nmc_fields_setting_wired[] = {
-	SETTING_FIELD ("name"),                                  /* 0 */
-	SETTING_FIELD (NM_SETTING_WIRED_PORT),                   /* 1 */
-	SETTING_FIELD (NM_SETTING_WIRED_SPEED),                  /* 2 */
-	SETTING_FIELD (NM_SETTING_WIRED_DUPLEX),                 /* 3 */
-	SETTING_FIELD (NM_SETTING_WIRED_AUTO_NEGOTIATE),         /* 4 */
-	SETTING_FIELD (NM_SETTING_WIRED_MAC_ADDRESS),            /* 5 */
-	SETTING_FIELD (NM_SETTING_WIRED_CLONED_MAC_ADDRESS),     /* 6 */
-	SETTING_FIELD (NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK), /* 7 */
-	SETTING_FIELD (NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST),  /* 8 */
-	SETTING_FIELD (NM_SETTING_WIRED_MTU),                    /* 9 */
-	SETTING_FIELD (NM_SETTING_WIRED_S390_SUBCHANNELS),       /* 10 */
-	SETTING_FIELD (NM_SETTING_WIRED_S390_NETTYPE),           /* 11 */
-	SETTING_FIELD (NM_SETTING_WIRED_S390_OPTIONS),           /* 12 */
-	SETTING_FIELD (NM_SETTING_WIRED_WAKE_ON_LAN),            /* 13 */
-	SETTING_FIELD (NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD),   /* 14 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_WIRED_ALL     "name"","\
-                                         NM_SETTING_WIRED_PORT","\
-                                         NM_SETTING_WIRED_SPEED","\
-                                         NM_SETTING_WIRED_DUPLEX","\
-                                         NM_SETTING_WIRED_AUTO_NEGOTIATE","\
-                                         NM_SETTING_WIRED_MAC_ADDRESS","\
-                                         NM_SETTING_WIRED_CLONED_MAC_ADDRESS","\
-                                         NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK","\
-                                         NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST","\
-                                         NM_SETTING_WIRED_MTU","\
-                                         NM_SETTING_WIRED_S390_SUBCHANNELS","\
-                                         NM_SETTING_WIRED_S390_NETTYPE","\
-                                         NM_SETTING_WIRED_S390_OPTIONS","\
-                                         NM_SETTING_WIRED_WAKE_ON_LAN","\
-                                         NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD
-
-/* Available fields for NM_SETTING_802_1X_SETTING_NAME */
-NmcOutputField nmc_fields_setting_8021X[] = {
-	SETTING_FIELD ("name"),                                               /* 0 */
-	SETTING_FIELD (NM_SETTING_802_1X_EAP),                                /* 1 */
-	SETTING_FIELD (NM_SETTING_802_1X_IDENTITY),                           /* 2 */
-	SETTING_FIELD (NM_SETTING_802_1X_ANONYMOUS_IDENTITY),                 /* 3 */
-	SETTING_FIELD (NM_SETTING_802_1X_PAC_FILE),                           /* 4 */
-	SETTING_FIELD (NM_SETTING_802_1X_CA_CERT),                            /* 5 */
-	SETTING_FIELD (NM_SETTING_802_1X_CA_CERT_PASSWORD),                   /* 6 */
-	SETTING_FIELD (NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS),             /* 7 */
-	SETTING_FIELD (NM_SETTING_802_1X_CA_PATH),                            /* 8 */
-	SETTING_FIELD (NM_SETTING_802_1X_SUBJECT_MATCH),                      /* 9 */
-	SETTING_FIELD (NM_SETTING_802_1X_ALTSUBJECT_MATCHES),                 /* 10 */
-	SETTING_FIELD (NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH),                /* 11 */
-	SETTING_FIELD (NM_SETTING_802_1X_CLIENT_CERT),                        /* 12 */
-	SETTING_FIELD (NM_SETTING_802_1X_CLIENT_CERT_PASSWORD),               /* 13 */
-	SETTING_FIELD (NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS),         /* 14 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE1_PEAPVER),                     /* 15 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE1_PEAPLABEL),                   /* 16 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING),           /* 17 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE1_AUTH_FLAGS),                  /* 18 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE2_AUTH),                        /* 19 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE2_AUTHEAP),                     /* 20 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD),            /* 21 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS),      /* 22 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_CERT),                     /* 23 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_PATH),                     /* 24 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH),               /* 25 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES),          /* 26 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH),         /* 27 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CLIENT_CERT),                 /* 28 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD),        /* 29 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS),  /* 30 */
-	SETTING_FIELD (NM_SETTING_802_1X_PASSWORD),                           /* 31 */
-	SETTING_FIELD (NM_SETTING_802_1X_PASSWORD_FLAGS),                     /* 32 */
-	SETTING_FIELD (NM_SETTING_802_1X_PASSWORD_RAW),                       /* 33 */
-	SETTING_FIELD (NM_SETTING_802_1X_PASSWORD_RAW_FLAGS),                 /* 34 */
-	SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY),                        /* 35 */
-	SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD),               /* 36 */
-	SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS),         /* 37 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY),                 /* 38 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD),        /* 39 */
-	SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS),  /* 40 */
-	SETTING_FIELD (NM_SETTING_802_1X_PIN),                                /* 41 */
-	SETTING_FIELD (NM_SETTING_802_1X_PIN_FLAGS),                          /* 42 */
-	SETTING_FIELD (NM_SETTING_802_1X_SYSTEM_CA_CERTS),                    /* 43 */
-	SETTING_FIELD (NM_SETTING_802_1X_AUTH_TIMEOUT),                       /* 44 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_802_1X_ALL     "name"","\
-                                          NM_SETTING_802_1X_EAP","\
-                                          NM_SETTING_802_1X_IDENTITY","\
-                                          NM_SETTING_802_1X_ANONYMOUS_IDENTITY","\
-                                          NM_SETTING_802_1X_PAC_FILE","\
-                                          NM_SETTING_802_1X_CA_CERT","\
-                                          NM_SETTING_802_1X_CA_CERT_PASSWORD","\
-                                          NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS","\
-                                          NM_SETTING_802_1X_CA_PATH","\
-                                          NM_SETTING_802_1X_SUBJECT_MATCH","\
-                                          NM_SETTING_802_1X_ALTSUBJECT_MATCHES","\
-                                          NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH","\
-                                          NM_SETTING_802_1X_CLIENT_CERT","\
-                                          NM_SETTING_802_1X_CLIENT_CERT_PASSWORD","\
-                                          NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS","\
-                                          NM_SETTING_802_1X_PHASE1_PEAPVER","\
-                                          NM_SETTING_802_1X_PHASE1_PEAPLABEL","\
-                                          NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING","\
-                                          NM_SETTING_802_1X_PHASE1_AUTH_FLAGS","\
-                                          NM_SETTING_802_1X_PHASE2_AUTH","\
-                                          NM_SETTING_802_1X_PHASE2_AUTHEAP","\
-                                          NM_SETTING_802_1X_PHASE2_CA_CERT","\
-                                          NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD","\
-                                          NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS","\
-                                          NM_SETTING_802_1X_PHASE2_CA_PATH","\
-                                          NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH","\
-                                          NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES","\
-                                          NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH","\
-                                          NM_SETTING_802_1X_PHASE2_CLIENT_CERT","\
-                                          NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD","\
-                                          NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS","\
-                                          NM_SETTING_802_1X_PASSWORD","\
-                                          NM_SETTING_802_1X_PASSWORD_FLAGS","\
-                                          NM_SETTING_802_1X_PASSWORD_RAW","\
-                                          NM_SETTING_802_1X_PASSWORD_RAW_FLAGS","\
-                                          NM_SETTING_802_1X_PRIVATE_KEY","\
-                                          NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD","\
-                                          NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS","\
-                                          NM_SETTING_802_1X_PHASE2_PRIVATE_KEY","\
-                                          NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD","\
-                                          NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS","\
-                                          NM_SETTING_802_1X_PIN","\
-                                          NM_SETTING_802_1X_PIN_FLAGS","\
-                                          NM_SETTING_802_1X_SYSTEM_CA_CERTS","\
-                                          NM_SETTING_802_1X_AUTH_TIMEOUT
-
-/* Available fields for NM_SETTING_WIRELESS_SETTING_NAME */
-NmcOutputField nmc_fields_setting_wireless[] = {
-	SETTING_FIELD ("name"),                                        /* 0 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SSID),                      /* 1 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_MODE),                      /* 2 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_BAND),                      /* 3 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_CHANNEL),                   /* 4 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_BSSID),                     /* 5 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_RATE),                      /* 6 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_TX_POWER),                  /* 7 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_MAC_ADDRESS),               /* 8 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS),        /* 9 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK), /* 10 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST),     /* 11 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION), /* 12 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_MTU),                       /* 13 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SEEN_BSSIDS),               /* 14 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_HIDDEN),                    /* 15 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_POWERSAVE),                 /* 16 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_WIRELESS_ALL     "name"","\
-                                            NM_SETTING_WIRELESS_SSID","\
-                                            NM_SETTING_WIRELESS_MODE","\
-                                            NM_SETTING_WIRELESS_BAND","\
-                                            NM_SETTING_WIRELESS_CHANNEL","\
-                                            NM_SETTING_WIRELESS_BSSID","\
-                                            NM_SETTING_WIRELESS_RATE","\
-                                            NM_SETTING_WIRELESS_TX_POWER","\
-                                            NM_SETTING_WIRELESS_MAC_ADDRESS","\
-                                            NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS","\
-                                            NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK","\
-                                            NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST","\
-                                            NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION","\
-                                            NM_SETTING_WIRELESS_MTU","\
-                                            NM_SETTING_WIRELESS_SEEN_BSSIDS","\
-                                            NM_SETTING_WIRELESS_HIDDEN"," \
-                                            NM_SETTING_WIRELESS_POWERSAVE
-
-/* Available fields for NM_SETTING_WIRELESS_SECURITY_SETTING_NAME */
-NmcOutputField nmc_fields_setting_wireless_security[] = {
-	SETTING_FIELD ("name"),                                            /* 0 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT),             /* 1 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX),        /* 2 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_AUTH_ALG),             /* 3 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_PROTO),                /* 4 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_PAIRWISE),             /* 5 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_GROUP),                /* 6 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME),        /* 7 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_WEP_KEY0),             /* 8 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_WEP_KEY1),             /* 9 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_WEP_KEY2),             /* 10 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_WEP_KEY3),             /* 11 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS),        /* 12 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE),         /* 13 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_PSK),                  /* 14 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS),            /* 15 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD),        /* 16 */
-	SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS),  /* 17 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_WIRELESS_SECURITY_ALL     "name"","\
-                                                     NM_SETTING_WIRELESS_SECURITY_KEY_MGMT","\
-                                                     NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX","\
-                                                     NM_SETTING_WIRELESS_SECURITY_AUTH_ALG","\
-                                                     NM_SETTING_WIRELESS_SECURITY_PROTO","\
-                                                     NM_SETTING_WIRELESS_SECURITY_PAIRWISE","\
-                                                     NM_SETTING_WIRELESS_SECURITY_GROUP","\
-                                                     NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME","\
-                                                     NM_SETTING_WIRELESS_SECURITY_WEP_KEY0","\
-                                                     NM_SETTING_WIRELESS_SECURITY_WEP_KEY1","\
-                                                     NM_SETTING_WIRELESS_SECURITY_WEP_KEY2","\
-                                                     NM_SETTING_WIRELESS_SECURITY_WEP_KEY3","\
-                                                     NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS","\
-                                                     NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE","\
-                                                     NM_SETTING_WIRELESS_SECURITY_PSK","\
-                                                     NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS","\
-                                                     NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD","\
-                                                     NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
-
-/* Available fields for NM_SETTING_IP4_CONFIG_SETTING_NAME */
-NmcOutputField nmc_fields_setting_ip4_config[] = {
-	SETTING_FIELD ("name"),                                   /* 0 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_METHOD),              /* 1 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_DNS),                 /* 2 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_DNS_SEARCH),          /* 3 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_DNS_OPTIONS),         /* 4 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_DNS_PRIORITY),        /* 5 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_ADDRESSES),           /* 6 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_GATEWAY),             /* 7 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_ROUTES),              /* 8 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_ROUTE_METRIC),        /* 9 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES),  /* 10 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS),     /* 11 */
-	SETTING_FIELD (NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID),     /* 12 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT),        /* 13 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME),  /* 14 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME),       /* 15 */
-	SETTING_FIELD (NM_SETTING_IP4_CONFIG_DHCP_FQDN),          /* 16 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_NEVER_DEFAULT),       /* 17 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_MAY_FAIL),            /* 18 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_DAD_TIMEOUT),         /* 19 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_IP4_CONFIG_ALL     "name"","\
-                                              NM_SETTING_IP_CONFIG_METHOD","\
-                                              NM_SETTING_IP_CONFIG_DNS","\
-                                              NM_SETTING_IP_CONFIG_DNS_SEARCH","\
-                                              NM_SETTING_IP_CONFIG_DNS_OPTIONS","\
-                                              NM_SETTING_IP_CONFIG_DNS_PRIORITY","\
-                                              NM_SETTING_IP_CONFIG_ADDRESSES","\
-                                              NM_SETTING_IP_CONFIG_GATEWAY","\
-                                              NM_SETTING_IP_CONFIG_ROUTES","\
-                                              NM_SETTING_IP_CONFIG_ROUTE_METRIC","\
-                                              NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES","\
-                                              NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS","\
-                                              NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID","\
-                                              NM_SETTING_IP_CONFIG_DHCP_TIMEOUT","\
-                                              NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME","\
-                                              NM_SETTING_IP_CONFIG_DHCP_HOSTNAME","\
-                                              NM_SETTING_IP4_CONFIG_DHCP_FQDN","\
-                                              NM_SETTING_IP_CONFIG_NEVER_DEFAULT","\
-                                              NM_SETTING_IP_CONFIG_MAY_FAIL","\
-                                              NM_SETTING_IP_CONFIG_DAD_TIMEOUT
-
-/* Available fields for NM_SETTING_IP6_CONFIG_SETTING_NAME */
-NmcOutputField nmc_fields_setting_ip6_config[] = {
-	SETTING_FIELD ("name"),                                   /* 0 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_METHOD),              /* 1 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_DNS),                 /* 2 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_DNS_SEARCH),          /* 3 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_DNS_OPTIONS),         /* 4 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_DNS_PRIORITY),        /* 5 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_ADDRESSES),           /* 6 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_GATEWAY),             /* 7 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_ROUTES),              /* 8 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_ROUTE_METRIC),        /* 9 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES),  /* 10 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS),     /* 11 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_NEVER_DEFAULT),       /* 12 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_MAY_FAIL),            /* 13 */
-	SETTING_FIELD (NM_SETTING_IP6_CONFIG_IP6_PRIVACY),        /* 14 */
-	SETTING_FIELD (NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE),      /* 15 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME),  /* 16 */
-	SETTING_FIELD (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME),       /* 17 */
-	SETTING_FIELD (NM_SETTING_IP6_CONFIG_TOKEN),              /* 18 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_IP6_CONFIG_ALL     "name"","\
-                                              NM_SETTING_IP_CONFIG_METHOD","\
-                                              NM_SETTING_IP_CONFIG_DNS","\
-                                              NM_SETTING_IP_CONFIG_DNS_SEARCH","\
-                                              NM_SETTING_IP_CONFIG_DNS_OPTIONS","\
-                                              NM_SETTING_IP_CONFIG_DNS_PRIORITY","\
-                                              NM_SETTING_IP_CONFIG_ADDRESSES","\
-                                              NM_SETTING_IP_CONFIG_GATEWAY","\
-                                              NM_SETTING_IP_CONFIG_ROUTES","\
-                                              NM_SETTING_IP_CONFIG_ROUTE_METRIC","\
-                                              NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES","\
-                                              NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS","\
-                                              NM_SETTING_IP_CONFIG_NEVER_DEFAULT","\
-                                              NM_SETTING_IP_CONFIG_MAY_FAIL","\
-                                              NM_SETTING_IP6_CONFIG_IP6_PRIVACY","\
-                                              NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE","\
-                                              NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME","\
-                                              NM_SETTING_IP_CONFIG_DHCP_HOSTNAME","\
-                                              NM_SETTING_IP6_CONFIG_TOKEN
-
-/* Available fields for NM_SETTING_SERIAL_SETTING_NAME */
-NmcOutputField nmc_fields_setting_serial[] = {
-	SETTING_FIELD ("name"),                        /* 0 */
-	SETTING_FIELD (NM_SETTING_SERIAL_BAUD),        /* 1 */
-	SETTING_FIELD (NM_SETTING_SERIAL_BITS),        /* 2 */
-	SETTING_FIELD (NM_SETTING_SERIAL_PARITY),      /* 3 */
-	SETTING_FIELD (NM_SETTING_SERIAL_STOPBITS),    /* 4 */
-	SETTING_FIELD (NM_SETTING_SERIAL_SEND_DELAY),  /* 5 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_SERIAL_ALL     "name"","\
-                                          NM_SETTING_SERIAL_BAUD","\
-                                          NM_SETTING_SERIAL_BITS","\
-                                          NM_SETTING_SERIAL_PARITY","\
-                                          NM_SETTING_SERIAL_STOPBITS","\
-                                          NM_SETTING_SERIAL_SEND_DELAY
-
-/* Available fields for NM_SETTING_PPP_SETTING_NAME */
-NmcOutputField nmc_fields_setting_ppp[] = {
-	SETTING_FIELD ("name"),                            /* 0 */
-	SETTING_FIELD (NM_SETTING_PPP_NOAUTH),             /* 1 */
-	SETTING_FIELD (NM_SETTING_PPP_REFUSE_EAP),         /* 2 */
-	SETTING_FIELD (NM_SETTING_PPP_REFUSE_PAP),         /* 3 */
-	SETTING_FIELD (NM_SETTING_PPP_REFUSE_CHAP),        /* 4 */
-	SETTING_FIELD (NM_SETTING_PPP_REFUSE_MSCHAP),      /* 5 */
-	SETTING_FIELD (NM_SETTING_PPP_REFUSE_MSCHAPV2),    /* 6 */
-	SETTING_FIELD (NM_SETTING_PPP_NOBSDCOMP),          /* 7 */
-	SETTING_FIELD (NM_SETTING_PPP_NODEFLATE),          /* 8 */
-	SETTING_FIELD (NM_SETTING_PPP_NO_VJ_COMP),         /* 9 */
-	SETTING_FIELD (NM_SETTING_PPP_REQUIRE_MPPE),       /* 10 */
-	SETTING_FIELD (NM_SETTING_PPP_REQUIRE_MPPE_128),   /* 11 */
-	SETTING_FIELD (NM_SETTING_PPP_MPPE_STATEFUL),      /* 12 */
-	SETTING_FIELD (NM_SETTING_PPP_CRTSCTS),            /* 13 */
-	SETTING_FIELD (NM_SETTING_PPP_BAUD),               /* 14 */
-	SETTING_FIELD (NM_SETTING_PPP_MRU),                /* 15 */
-	SETTING_FIELD (NM_SETTING_PPP_MTU),                /* 16 */
-	SETTING_FIELD (NM_SETTING_PPP_LCP_ECHO_FAILURE),   /* 17 */
-	SETTING_FIELD (NM_SETTING_PPP_LCP_ECHO_INTERVAL),  /* 18 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_PPP_ALL     "name"","\
-                                       NM_SETTING_PPP_NOAUTH","\
-                                       NM_SETTING_PPP_REFUSE_EAP","\
-                                       NM_SETTING_PPP_REFUSE_PAP","\
-                                       NM_SETTING_PPP_REFUSE_CHAP","\
-                                       NM_SETTING_PPP_REFUSE_MSCHAP","\
-                                       NM_SETTING_PPP_REFUSE_MSCHAPV2","\
-                                       NM_SETTING_PPP_NOBSDCOMP","\
-                                       NM_SETTING_PPP_NODEFLATE","\
-                                       NM_SETTING_PPP_NO_VJ_COMP","\
-                                       NM_SETTING_PPP_REQUIRE_MPPE","\
-                                       NM_SETTING_PPP_REQUIRE_MPPE_128","\
-                                       NM_SETTING_PPP_MPPE_STATEFUL","\
-                                       NM_SETTING_PPP_CRTSCTS","\
-                                       NM_SETTING_PPP_BAUD","\
-                                       NM_SETTING_PPP_MRU","\
-                                       NM_SETTING_PPP_MTU","\
-                                       NM_SETTING_PPP_LCP_ECHO_FAILURE","\
-                                       NM_SETTING_PPP_LCP_ECHO_INTERVAL
-
-/* Available fields for NM_SETTING_PPPOE_SETTING_NAME */
-NmcOutputField nmc_fields_setting_pppoe[] = {
-	SETTING_FIELD ("name"),                           /* 0 */
-	SETTING_FIELD (NM_SETTING_PPPOE_SERVICE),         /* 1 */
-	SETTING_FIELD (NM_SETTING_PPPOE_USERNAME),        /* 2 */
-	SETTING_FIELD (NM_SETTING_PPPOE_PASSWORD),        /* 3 */
-	SETTING_FIELD (NM_SETTING_PPPOE_PASSWORD_FLAGS),  /* 4 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_PPPOE_ALL     "name"","\
-                                         NM_SETTING_PPPOE_SERVICE","\
-                                         NM_SETTING_PPPOE_USERNAME","\
-                                         NM_SETTING_PPPOE_PASSWORD","\
-                                         NM_SETTING_PPPOE_PASSWORD_FLAGS
-
-/* Available fields for NM_SETTING_ADSL_SETTING_NAME */
-NmcOutputField nmc_fields_setting_adsl[] = {
-	SETTING_FIELD ("name"),                          /* 0 */
-	SETTING_FIELD (NM_SETTING_ADSL_USERNAME),        /* 1 */
-	SETTING_FIELD (NM_SETTING_ADSL_PASSWORD),        /* 2 */
-	SETTING_FIELD (NM_SETTING_ADSL_PASSWORD_FLAGS),  /* 3 */
-	SETTING_FIELD (NM_SETTING_ADSL_PROTOCOL),        /* 4 */
-	SETTING_FIELD (NM_SETTING_ADSL_ENCAPSULATION),   /* 5 */
-	SETTING_FIELD (NM_SETTING_ADSL_VPI),             /* 6 */
-	SETTING_FIELD (NM_SETTING_ADSL_VCI),             /* 7 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_ADSL_ALL     "name"","\
-                                        NM_SETTING_ADSL_USERNAME","\
-                                        NM_SETTING_ADSL_PASSWORD","\
-                                        NM_SETTING_ADSL_PASSWORD_FLAGS","\
-                                        NM_SETTING_ADSL_PROTOCOL","\
-                                        NM_SETTING_ADSL_ENCAPSULATION","\
-                                        NM_SETTING_ADSL_VPI","\
-                                        NM_SETTING_ADSL_VCI
-
-/* Available fields for NM_SETTING_GSM_SETTING_NAME */
-NmcOutputField nmc_fields_setting_gsm[] = {
-	SETTING_FIELD ("name"),                         /* 0 */
-	SETTING_FIELD (NM_SETTING_GSM_NUMBER),          /* 1 */
-	SETTING_FIELD (NM_SETTING_GSM_USERNAME),        /* 2 */
-	SETTING_FIELD (NM_SETTING_GSM_PASSWORD),        /* 3 */
-	SETTING_FIELD (NM_SETTING_GSM_PASSWORD_FLAGS),  /* 4 */
-	SETTING_FIELD (NM_SETTING_GSM_APN),             /* 5 */
-	SETTING_FIELD (NM_SETTING_GSM_NETWORK_ID),      /* 6 */
-	SETTING_FIELD (NM_SETTING_GSM_PIN),             /* 7 */
-	SETTING_FIELD (NM_SETTING_GSM_PIN_FLAGS),       /* 8 */
-	SETTING_FIELD (NM_SETTING_GSM_HOME_ONLY),       /* 9 */
-	SETTING_FIELD (NM_SETTING_GSM_DEVICE_ID),       /* 10 */
-	SETTING_FIELD (NM_SETTING_GSM_SIM_ID),          /* 11 */
-	SETTING_FIELD (NM_SETTING_GSM_SIM_OPERATOR_ID), /* 12 */
-	SETTING_FIELD (NM_SETTING_GSM_MTU),             /* 13 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_GSM_ALL     "name"","\
-                                       NM_SETTING_GSM_NUMBER","\
-                                       NM_SETTING_GSM_USERNAME","\
-                                       NM_SETTING_GSM_PASSWORD","\
-                                       NM_SETTING_GSM_PASSWORD_FLAGS","\
-                                       NM_SETTING_GSM_APN","\
-                                       NM_SETTING_GSM_NETWORK_ID","\
-                                       NM_SETTING_GSM_PIN","\
-                                       NM_SETTING_GSM_PIN_FLAGS","\
-                                       NM_SETTING_GSM_HOME_ONLY","\
-                                       NM_SETTING_GSM_DEVICE_ID","\
-                                       NM_SETTING_GSM_SIM_ID","\
-                                       NM_SETTING_GSM_SIM_OPERATOR_ID","\
-                                       NM_SETTING_GSM_MTU
-
-/* Available fields for NM_SETTING_CDMA_SETTING_NAME */
-NmcOutputField nmc_fields_setting_cdma[] = {
-	SETTING_FIELD ("name"),                          /* 0 */
-	SETTING_FIELD (NM_SETTING_CDMA_NUMBER),          /* 1 */
-	SETTING_FIELD (NM_SETTING_CDMA_USERNAME),        /* 2 */
-	SETTING_FIELD (NM_SETTING_CDMA_PASSWORD),        /* 3 */
-	SETTING_FIELD (NM_SETTING_CDMA_PASSWORD_FLAGS),  /* 4 */
-	SETTING_FIELD (NM_SETTING_CDMA_MTU),             /* 5 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_CDMA_ALL     "name"","\
-                                        NM_SETTING_CDMA_NUMBER","\
-                                        NM_SETTING_CDMA_USERNAME","\
-                                        NM_SETTING_CDMA_PASSWORD","\
-                                        NM_SETTING_CDMA_PASSWORD_FLAGS","\
-                                        NM_SETTING_CDMA_MTU
-
-/* Available fields for NM_SETTING_BLUETOOTH_SETTING_NAME */
-NmcOutputField nmc_fields_setting_bluetooth[] = {
-	SETTING_FIELD ("name"),                       /* 0 */
-	SETTING_FIELD (NM_SETTING_BLUETOOTH_BDADDR),  /* 1 */
-	SETTING_FIELD (NM_SETTING_BLUETOOTH_TYPE),    /* 2 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_BLUETOOTH_ALL     "name"","\
-                                             NM_SETTING_BLUETOOTH_BDADDR","\
-                                             NM_SETTING_BLUETOOTH_TYPE
-
-/* Available fields for NM_SETTING_OLPC_MESH_SETTING_NAME */
-NmcOutputField nmc_fields_setting_olpc_mesh[] = {
-	SETTING_FIELD ("name"),                                     /* 0 */
-	SETTING_FIELD (NM_SETTING_OLPC_MESH_SSID),                  /* 1 */
-	SETTING_FIELD (NM_SETTING_OLPC_MESH_CHANNEL),               /* 2 */
-	SETTING_FIELD (NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS),  /* 3 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_OLPC_MESH_ALL     "name"","\
-                                             NM_SETTING_OLPC_MESH_SSID","\
-                                             NM_SETTING_OLPC_MESH_CHANNEL","\
-                                             NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
-
-/* Available fields for NM_SETTING_VPN_SETTING_NAME */
-NmcOutputField nmc_fields_setting_vpn[] = {
-	SETTING_FIELD ("name"),                       /* 0 */
-	SETTING_FIELD (NM_SETTING_VPN_SERVICE_TYPE),  /* 1 */
-	SETTING_FIELD (NM_SETTING_VPN_USER_NAME),     /* 2 */
-	SETTING_FIELD (NM_SETTING_VPN_DATA),          /* 3 */
-	SETTING_FIELD (NM_SETTING_VPN_SECRETS),       /* 4 */
-	SETTING_FIELD (NM_SETTING_VPN_PERSISTENT),    /* 5 */
-	SETTING_FIELD (NM_SETTING_VPN_TIMEOUT),       /* 6 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_VPN_ALL     "name"","\
-                                       NM_SETTING_VPN_SERVICE_TYPE","\
-                                       NM_SETTING_VPN_USER_NAME","\
-                                       NM_SETTING_VPN_DATA","\
-                                       NM_SETTING_VPN_SECRETS","\
-                                       NM_SETTING_VPN_PERSISTENT","\
-                                       NM_SETTING_VPN_TIMEOUT
-
-/* Available fields for NM_SETTING_WIMAX_SETTING_NAME */
-NmcOutputField nmc_fields_setting_wimax[] = {
-	SETTING_FIELD ("name"),                         /* 0 */
-	SETTING_FIELD (NM_SETTING_WIMAX_MAC_ADDRESS),   /* 1 */
-	SETTING_FIELD (NM_SETTING_WIMAX_NETWORK_NAME),  /* 2 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_WIMAX_ALL     "name"","\
-                                         NM_SETTING_WIMAX_MAC_ADDRESS","\
-                                         NM_SETTING_WIMAX_NETWORK_NAME
-
-/* Available fields for NM_SETTING_INFINIBAND_SETTING_NAME */
-NmcOutputField nmc_fields_setting_infiniband[] = {
-	SETTING_FIELD ("name"),                                /* 0 */
-	SETTING_FIELD (NM_SETTING_INFINIBAND_MAC_ADDRESS),     /* 1 */
-	SETTING_FIELD (NM_SETTING_INFINIBAND_MTU),             /* 2 */
-	SETTING_FIELD (NM_SETTING_INFINIBAND_TRANSPORT_MODE),  /* 3 */
-	SETTING_FIELD (NM_SETTING_INFINIBAND_P_KEY),           /* 4 */
-	SETTING_FIELD (NM_SETTING_INFINIBAND_PARENT),          /* 5 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_INFINIBAND_ALL     "name"","\
-                                              NM_SETTING_INFINIBAND_MAC_ADDRESS","\
-                                              NM_SETTING_INFINIBAND_MTU"," \
-                                              NM_SETTING_INFINIBAND_TRANSPORT_MODE"," \
-                                              NM_SETTING_INFINIBAND_P_KEY"," \
-                                              NM_SETTING_INFINIBAND_PARENT
-
-/* Available fields for NM_SETTING_BOND_SETTING_NAME */
-NmcOutputField nmc_fields_setting_bond[] = {
-	SETTING_FIELD ("name"),                   /* 0 */
-	SETTING_FIELD (NM_SETTING_BOND_OPTIONS),  /* 1 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_BOND_ALL     "name"","\
-                                        NM_SETTING_BOND_OPTIONS
-
-/* Available fields for NM_SETTING_VLAN_SETTING_NAME */
-NmcOutputField nmc_fields_setting_vlan[] = {
-	SETTING_FIELD ("name"),                                /* 0 */
-	SETTING_FIELD (NM_SETTING_VLAN_PARENT),                /* 1 */
-	SETTING_FIELD (NM_SETTING_VLAN_ID),                    /* 2 */
-	SETTING_FIELD (NM_SETTING_VLAN_FLAGS),                 /* 3 */
-	SETTING_FIELD (NM_SETTING_VLAN_INGRESS_PRIORITY_MAP),  /* 4 */
-	SETTING_FIELD (NM_SETTING_VLAN_EGRESS_PRIORITY_MAP),   /* 5 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_VLAN_ALL     "name"","\
-                                        NM_SETTING_VLAN_PARENT","\
-                                        NM_SETTING_VLAN_ID","\
-                                        NM_SETTING_VLAN_FLAGS","\
-                                        NM_SETTING_VLAN_INGRESS_PRIORITY_MAP","\
-                                        NM_SETTING_VLAN_EGRESS_PRIORITY_MAP
-
-/* Available fields for NM_SETTING_BRIDGE_SETTING_NAME */
-NmcOutputField nmc_fields_setting_bridge[] = {
-	SETTING_FIELD ("name"),                                /* 0 */
-	SETTING_FIELD (NM_SETTING_BRIDGE_MAC_ADDRESS),         /* 1 */
-	SETTING_FIELD (NM_SETTING_BRIDGE_STP),                 /* 2 */
-	SETTING_FIELD (NM_SETTING_BRIDGE_PRIORITY),            /* 3 */
-	SETTING_FIELD (NM_SETTING_BRIDGE_FORWARD_DELAY),       /* 4 */
-	SETTING_FIELD (NM_SETTING_BRIDGE_HELLO_TIME),          /* 5 */
-	SETTING_FIELD (NM_SETTING_BRIDGE_MAX_AGE),             /* 6 */
-	SETTING_FIELD (NM_SETTING_BRIDGE_AGEING_TIME),         /* 7 */
-	SETTING_FIELD (NM_SETTING_BRIDGE_MULTICAST_SNOOPING),  /* 8 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_BRIDGE_ALL    "name"","\
-                                         NM_SETTING_BRIDGE_MAC_ADDRESS","\
-                                         NM_SETTING_BRIDGE_STP","\
-                                         NM_SETTING_BRIDGE_PRIORITY","\
-                                         NM_SETTING_BRIDGE_FORWARD_DELAY","\
-                                         NM_SETTING_BRIDGE_HELLO_TIME","\
-                                         NM_SETTING_BRIDGE_MAX_AGE","\
-                                         NM_SETTING_BRIDGE_AGEING_TIME","\
-                                         NM_SETTING_BRIDGE_MULTICAST_SNOOPING
-
-/* Available fields for NM_SETTING_BRIDGE_PORT_SETTING_NAME */
-NmcOutputField nmc_fields_setting_bridge_port[] = {
-	SETTING_FIELD ("name"),                               /* 0 */
-	SETTING_FIELD (NM_SETTING_BRIDGE_PORT_PRIORITY),      /* 1 */
-	SETTING_FIELD (NM_SETTING_BRIDGE_PORT_PATH_COST),     /* 2 */
-	SETTING_FIELD (NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE),  /* 3 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_BRIDGE_PORT_ALL    "name"","\
-                                              NM_SETTING_BRIDGE_PORT_PRIORITY","\
-                                              NM_SETTING_BRIDGE_PORT_PATH_COST","\
-                                              NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
-
-/* Available fields for NM_SETTING_TEAM_SETTING_NAME */
-NmcOutputField nmc_fields_setting_team[] = {
-	SETTING_FIELD ("name"),                  /* 0 */
-	SETTING_FIELD (NM_SETTING_TEAM_CONFIG),  /* 1 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_TEAM_ALL     "name"","\
-                                        NM_SETTING_TEAM_CONFIG
-
-/* Available fields for NM_SETTING_TEAM_PORT_SETTING_NAME */
-NmcOutputField nmc_fields_setting_team_port[] = {
-	SETTING_FIELD ("name"),                       /* 0 */
-	SETTING_FIELD (NM_SETTING_TEAM_PORT_CONFIG),  /* 1 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_TEAM_PORT_ALL     "name"","\
-                                             NM_SETTING_TEAM_PORT_CONFIG
-
-/* Available fields for NM_SETTING_DCB_SETTING_NAME */
-NmcOutputField nmc_fields_setting_dcb[] = {
-	SETTING_FIELD ("name"),                                      /* 0 */
-	SETTING_FIELD (NM_SETTING_DCB_APP_FCOE_FLAGS),               /* 1 */
-	SETTING_FIELD (NM_SETTING_DCB_APP_FCOE_PRIORITY),            /* 2 */
-	SETTING_FIELD (NM_SETTING_DCB_APP_FCOE_MODE),                /* 3 */
-	SETTING_FIELD (NM_SETTING_DCB_APP_ISCSI_FLAGS),              /* 4 */
-	SETTING_FIELD (NM_SETTING_DCB_APP_ISCSI_PRIORITY),           /* 5 */
-	SETTING_FIELD (NM_SETTING_DCB_APP_FIP_FLAGS),                /* 6 */
-	SETTING_FIELD (NM_SETTING_DCB_APP_FIP_PRIORITY),             /* 7 */
-	SETTING_FIELD (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS),  /* 8 */
-	SETTING_FIELD (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL),        /* 9 */
-	SETTING_FIELD (NM_SETTING_DCB_PRIORITY_GROUP_FLAGS),         /* 10 */
-	SETTING_FIELD (NM_SETTING_DCB_PRIORITY_GROUP_ID),            /* 11 */
-	SETTING_FIELD (NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH),     /* 12 */
-	SETTING_FIELD (NM_SETTING_DCB_PRIORITY_BANDWIDTH),           /* 13 */
-	SETTING_FIELD (NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH),    /* 14 */
-	SETTING_FIELD (NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS),       /* 15 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_DCB_ALL     "name"","\
-                                       NM_SETTING_DCB_APP_FCOE_FLAGS","\
-                                       NM_SETTING_DCB_APP_FCOE_PRIORITY","\
-                                       NM_SETTING_DCB_APP_FCOE_MODE","\
-                                       NM_SETTING_DCB_APP_ISCSI_FLAGS","\
-                                       NM_SETTING_DCB_APP_ISCSI_PRIORITY","\
-                                       NM_SETTING_DCB_APP_FIP_FLAGS","\
-                                       NM_SETTING_DCB_APP_FIP_PRIORITY","\
-                                       NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS","\
-                                       NM_SETTING_DCB_PRIORITY_FLOW_CONTROL","\
-                                       NM_SETTING_DCB_PRIORITY_GROUP_FLAGS","\
-                                       NM_SETTING_DCB_PRIORITY_GROUP_ID","\
-                                       NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH","\
-                                       NM_SETTING_DCB_PRIORITY_BANDWIDTH","\
-                                       NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH","\
-                                       NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS
-
-/* Available fields for NM_SETTING_DUMMY_SETTING_NAME */
-NmcOutputField nmc_fields_setting_dummy[] = {
-	SETTING_FIELD ("name"),                                /* 0 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_DUMMY_ALL       "name"
-
-/* Available fields for NM_SETTING_TUN_SETTING_NAME */
-NmcOutputField nmc_fields_setting_tun[] = {
-	SETTING_FIELD ("name"),                                /* 0 */
-	SETTING_FIELD (NM_SETTING_TUN_MODE),                   /* 1 */
-	SETTING_FIELD (NM_SETTING_TUN_OWNER),                  /* 2 */
-	SETTING_FIELD (NM_SETTING_TUN_GROUP),                  /* 3 */
-	SETTING_FIELD (NM_SETTING_TUN_PI),                     /* 4 */
-	SETTING_FIELD (NM_SETTING_TUN_VNET_HDR),               /* 5 */
-	SETTING_FIELD (NM_SETTING_TUN_MULTI_QUEUE),            /* 6 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_TUN_ALL     "name"","\
-                                       NM_SETTING_TUN_MODE","\
-                                       NM_SETTING_TUN_OWNER","\
-                                       NM_SETTING_TUN_GROUP","\
-                                       NM_SETTING_TUN_PI","\
-                                       NM_SETTING_TUN_VNET_HDR","\
-                                       NM_SETTING_TUN_MULTI_QUEUE
-
-/* Available fields for NM_SETTING_IP_TUNNEL_SETTING_NAME */
-NmcOutputField nmc_fields_setting_ip_tunnel[] = {
-	SETTING_FIELD ("name"),                                       /* 0 */
-	SETTING_FIELD (NM_SETTING_IP_TUNNEL_MODE),                    /* 1 */
-	SETTING_FIELD (NM_SETTING_IP_TUNNEL_PARENT),                  /* 2 */
-	SETTING_FIELD (NM_SETTING_IP_TUNNEL_LOCAL),                   /* 3 */
-	SETTING_FIELD (NM_SETTING_IP_TUNNEL_REMOTE),                  /* 4 */
-	SETTING_FIELD (NM_SETTING_IP_TUNNEL_TTL),                     /* 5 */
-	SETTING_FIELD (NM_SETTING_IP_TUNNEL_TOS),                     /* 6 */
-	SETTING_FIELD (NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY),      /* 7 */
-	SETTING_FIELD (NM_SETTING_IP_TUNNEL_INPUT_KEY),               /* 8 */
-	SETTING_FIELD (NM_SETTING_IP_TUNNEL_OUTPUT_KEY),              /* 9 */
-	SETTING_FIELD (NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT),     /* 10 */
-	SETTING_FIELD (NM_SETTING_IP_TUNNEL_FLOW_LABEL),              /* 11 */
-	SETTING_FIELD (NM_SETTING_IP_TUNNEL_MTU),                     /* 12 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_IP_TUNNEL_ALL     "name"","\
-                                              NM_SETTING_IP_TUNNEL_MODE","\
-                                              NM_SETTING_IP_TUNNEL_PARENT","\
-                                              NM_SETTING_IP_TUNNEL_LOCAL","\
-                                              NM_SETTING_IP_TUNNEL_REMOTE","\
-                                              NM_SETTING_IP_TUNNEL_TTL","\
-                                              NM_SETTING_IP_TUNNEL_TOS","\
-                                              NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY","\
-                                              NM_SETTING_IP_TUNNEL_INPUT_KEY","\
-                                              NM_SETTING_IP_TUNNEL_OUTPUT_KEY","\
-                                              NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT","\
-                                              NM_SETTING_IP_TUNNEL_FLOW_LABEL","\
-                                              NM_SETTING_IP_TUNNEL_MTU
-
-/* Available fields for NM_SETTING_MACSEC_SETTING_NAME */
-NmcOutputField nmc_fields_setting_macsec[] = {
-	SETTING_FIELD ("name"),                                 /* 0 */
-	SETTING_FIELD (NM_SETTING_MACSEC_PARENT),               /* 1 */
-	SETTING_FIELD (NM_SETTING_MACSEC_MODE),                 /* 2 */
-	SETTING_FIELD (NM_SETTING_MACSEC_ENCRYPT),              /* 3 */
-	SETTING_FIELD (NM_SETTING_MACSEC_MKA_CAK),              /* 4 */
-	SETTING_FIELD (NM_SETTING_MACSEC_MKA_CAK_FLAGS),        /* 5 */
-	SETTING_FIELD (NM_SETTING_MACSEC_MKA_CKN),              /* 6 */
-	SETTING_FIELD (NM_SETTING_MACSEC_PORT),                 /* 7 */
-	SETTING_FIELD (NM_SETTING_MACSEC_VALIDATION),           /* 8 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_MACSEC_ALL     "name"","\
-                                           NM_SETTING_MACSEC_PARENT","\
-                                           NM_SETTING_MACSEC_MODE","\
-                                           NM_SETTING_MACSEC_ENCRYPT","\
-                                           NM_SETTING_MACSEC_MKA_CAK","\
-                                           NM_SETTING_MACSEC_MKA_CAK_FLAGS","\
-                                           NM_SETTING_MACSEC_MKA_CKN","\
-                                           NM_SETTING_MACSEC_PORT","\
-                                           NM_SETTING_MACSEC_VALIDATION
-
-/* Available fields for NM_SETTING_MACVLAN_SETTING_NAME */
-NmcOutputField nmc_fields_setting_macvlan[] = {
-	SETTING_FIELD ("name"),                                 /* 0 */
-	SETTING_FIELD (NM_SETTING_MACVLAN_PARENT),              /* 1 */
-	SETTING_FIELD (NM_SETTING_MACVLAN_MODE),                /* 2 */
-	SETTING_FIELD (NM_SETTING_MACVLAN_PROMISCUOUS),         /* 3 */
-	SETTING_FIELD (NM_SETTING_MACVLAN_TAP),                 /* 4 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_MACVLAN_ALL     "name"","\
-                                           NM_SETTING_MACVLAN_PARENT","\
-                                           NM_SETTING_MACVLAN_MODE","\
-                                           NM_SETTING_MACVLAN_PROMISCUOUS","\
-                                           NM_SETTING_MACVLAN_TAP
-
-/* Available fields for NM_SETTING_VXLAN_SETTING_NAME */
-NmcOutputField nmc_fields_setting_vxlan[] = {
-	SETTING_FIELD ("name"),                            /* 0 */
-	SETTING_FIELD (NM_SETTING_VXLAN_PARENT),           /* 1 */
-	SETTING_FIELD (NM_SETTING_VXLAN_ID),               /* 2 */
-	SETTING_FIELD (NM_SETTING_VXLAN_LOCAL),            /* 3 */
-	SETTING_FIELD (NM_SETTING_VXLAN_REMOTE),           /* 4 */
-	SETTING_FIELD (NM_SETTING_VXLAN_SOURCE_PORT_MIN),  /* 5 */
-	SETTING_FIELD (NM_SETTING_VXLAN_SOURCE_PORT_MAX),  /* 6 */
-	SETTING_FIELD (NM_SETTING_VXLAN_DESTINATION_PORT), /* 7 */
-	SETTING_FIELD (NM_SETTING_VXLAN_TOS),              /* 8 */
-	SETTING_FIELD (NM_SETTING_VXLAN_TTL),              /* 9 */
-	SETTING_FIELD (NM_SETTING_VXLAN_AGEING),           /* 10 */
-	SETTING_FIELD (NM_SETTING_VXLAN_LIMIT),            /* 11 */
-	SETTING_FIELD (NM_SETTING_VXLAN_LEARNING),         /* 12 */
-	SETTING_FIELD (NM_SETTING_VXLAN_PROXY),            /* 13 */
-	SETTING_FIELD (NM_SETTING_VXLAN_RSC),              /* 14 */
-	SETTING_FIELD (NM_SETTING_VXLAN_L2_MISS),          /* 15 */
-	SETTING_FIELD (NM_SETTING_VXLAN_L3_MISS),          /* 16 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_VXLAN_ALL         "name"","\
-                                             NM_SETTING_VXLAN_PARENT","\
-                                             NM_SETTING_VXLAN_ID","\
-                                             NM_SETTING_VXLAN_LOCAL","\
-                                             NM_SETTING_VXLAN_REMOTE","\
-                                             NM_SETTING_VXLAN_SOURCE_PORT_MIN","\
-                                             NM_SETTING_VXLAN_SOURCE_PORT_MAX","\
-                                             NM_SETTING_VXLAN_DESTINATION_PORT","\
-                                             NM_SETTING_VXLAN_TOS","\
-                                             NM_SETTING_VXLAN_TTL","\
-                                             NM_SETTING_VXLAN_AGEING","\
-                                             NM_SETTING_VXLAN_LIMIT","\
-                                             NM_SETTING_VXLAN_LEARNING","\
-                                             NM_SETTING_VXLAN_PROXY","\
-                                             NM_SETTING_VXLAN_RSC","\
-                                             NM_SETTING_VXLAN_L2_MISS","\
-                                             NM_SETTING_VXLAN_L3_MISS
-
-/* Available fields for NM_SETTING_PROXY_SETTING_NAME */
-NmcOutputField nmc_fields_setting_proxy[] = {
-	SETTING_FIELD ("name"),                            /* 0 */
-	SETTING_FIELD (NM_SETTING_PROXY_METHOD),           /* 1 */
-	SETTING_FIELD (NM_SETTING_PROXY_BROWSER_ONLY),     /* 2 */
-	SETTING_FIELD (NM_SETTING_PROXY_PAC_URL),          /* 3 */
-	SETTING_FIELD (NM_SETTING_PROXY_PAC_SCRIPT),       /* 4 */
-	{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
-};
-#define NMC_FIELDS_SETTING_PROXY_ALL         "name"","\
-                                             NM_SETTING_PROXY_METHOD","\
-                                             NM_SETTING_PROXY_BROWSER_ONLY","\
-                                             NM_SETTING_PROXY_PAC_URL","\
-                                             NM_SETTING_PROXY_PAC_SCRIPT
-/*----------------------------------------------------------------------------*/
-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, NmcPropertyGetType get_type)
-{
-	GString *flag_str;
-
-	if (get_type == NMC_PROPERTY_GET_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, NmcPropertyGetType get_type)
-{
-	if (get_type == NMC_PROPERTY_GET_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,
-                              NmcPropertyGetType get_type)
-{
-	if (get_type == NMC_PROPERTY_GET_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, NmcPropertyGetType get_type)
-{
-	GString *flag_str;
-
-	if (get_type == NMC_PROPERTY_GET_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);
-}
-
-
-/*  generic helper macros for property functions */
-#define DEFINE_GETTER(func_name, property_name) \
-	static char * \
-	func_name (NMSetting *setting, NmcPropertyGetType get_type) \
-	{ \
-		char *s; \
-		GValue val = G_VALUE_INIT; \
-		g_value_init (&val, G_TYPE_STRING); \
-		g_object_get_property (G_OBJECT (setting), property_name, &val); \
-		s = g_value_dup_string (&val); \
-		g_value_unset (&val); \
-		return s; \
-	}
-
-#define DEFINE_GETTER_WITH_DEFAULT(func_name, property_name, check_is_default) \
-	static char * \
-	func_name (NMSetting *setting, NmcPropertyGetType get_type) \
-	{ \
-		const char *s; \
-		char *s_full; \
-		GValue val = G_VALUE_INIT; \
-		\
-		if ((check_is_default)) { \
-			if (get_type == NMC_PROPERTY_GET_PARSABLE) \
-				return g_strdup (""); \
-			return g_strdup (_("(default)")); \
-		} \
-		\
-		g_value_init (&val, G_TYPE_STRING); \
-		g_object_get_property (G_OBJECT (setting), property_name, &val); \
-		s = g_value_get_string (&val); \
-		if (get_type == NMC_PROPERTY_GET_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; \
-	}
-
-#define DEFINE_SECRET_FLAGS_GETTER(func_name, property_name) \
-	static char * \
-	func_name (NMSetting *setting, NmcPropertyGetType get_type) \
-	{ \
-		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 secret_flags_to_string (v, get_type); \
-	}
-
-#define DEFINE_SETTER_STR_LIST_MULTI(def_func, s_macro, set_func) \
-	static gboolean \
-	def_func (NMSetting *setting, \
-	          const char *prop, \
-	          const char *val, \
-	          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 (val, " \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 (NMSetting *setting, const char *prop, const char *val, GError **error) \
-	{ \
-		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 (val, ",", 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(def_func, s_macro, num_func, rem_func) \
-	static gboolean \
-	def_func (NMSetting *setting, const char *prop, const char *option, guint32 idx, GError **error) \
-	{ \
-		guint32 num; \
-		if (option) { \
-			g_set_error (error, 1, 0, _("index '%s' is not valid"), option); \
-			return FALSE; \
-		} \
-		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 (s_macro (setting), idx); \
-		return TRUE; \
-	}
-
-#define DEFINE_REMOVER_INDEX_OR_VALUE(def_func, s_macro, num_func, rem_func_idx, rem_func_val) \
-	static gboolean \
-	def_func (NMSetting *setting, const char *prop, const char *value, guint32 idx, GError **error) \
-	{ \
-		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 (NMSetting *setting, const char *prop, const char *option, guint32 idx, GError **error) \
-	{ \
-		gboolean success = FALSE; \
-		if (option && *option) { \
-			success = rem_func (s_macro (setting), option); \
-			if (!success) \
-				g_set_error (error, 1, 0, _("invalid option '%s'"), option); \
-		} else \
-			g_set_error_literal (error, 1, 0, _("missing option")); \
-		return success; \
-	}
-
-#define DEFINE_ALLOWED_VAL_FUNC(def_func, valid_values) \
-	static const char ** \
-	def_func (NMSetting *setting, const char *prop) \
-	{ \
-		return valid_values; \
-	}
-
-#define DEFINE_ALLOWED_FOR_ENUMS(def_func, get_type_func, min, max) \
-	static const char ** \
-	def_func (NMSetting *setting, const char *prop) \
-	{ \
-		static const char **words = NULL; \
-		if (G_UNLIKELY (!words)) \
-			words = nm_utils_enum_get_values (get_type_func(), min, max); \
-		return words; \
-	}
-
-#define DEFINE_SETTER_MAC_BLACKLIST(def_func, s_macro, add_func) \
-	static gboolean \
-	def_func (NMSetting *setting, const char *prop, const char *val, GError **error) \
-	{ \
-		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 (val, " \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;
-}
-
-/* Validate 'val' number against to int property spec */
-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;
-}
-
-/* Validate 'val' number against to uint property spec */
-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;
-}
-
-/* --- generic property setter functions --- */
-static gboolean
-nmc_property_set_string (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	g_object_set (setting, prop, val, NULL);
-	return TRUE;
-}
-
-static gboolean
-nmc_property_set_uint (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	unsigned long val_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_uint (val, TRUE, 0, G_MAXUINT, &val_int)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid number (or out of range)"), val);
-		return FALSE;
-	}
-
-	/* Validate the number according to the property spec */
-	if (!validate_uint (setting, prop, (guint) val_int, error))
-		return FALSE;
-
-	g_object_set (setting, prop, (guint) val_int, NULL);
-	return TRUE;
-}
-
-static gboolean
-nmc_property_set_int (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	long int val_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_int (val, TRUE, G_MININT, G_MAXINT, &val_int)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid number (or out of range)"), val);
-		return FALSE;
-	}
-
-	/* Validate the number according to the property spec */
-	if (!validate_int (setting, prop, (gint) val_int, error))
-		return FALSE;
-
-	g_object_set (setting, prop, (gint) val_int, NULL);
-	return TRUE;
-}
-
-static gboolean
-nmc_property_set_int64 (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	long val_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_int (val, FALSE, 0, 0, &val_int)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid number (or out of range)"), val);
-		return FALSE;
-	}
-
-	/* Validate the number according to the property spec */
-	if (!validate_int64 (setting, prop, (gint64) val_int, error))
-		return FALSE;
-
-	g_object_set (setting, prop, (gint64) val_int, NULL);
-	return TRUE;
-}
-
-static gboolean
-nmc_property_set_flags (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	unsigned long val_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_uint (val, TRUE, 0, G_MAXUINT, &val_int)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid number (or out of range)"), val);
-		return FALSE;
-	}
-
-	/* Validate the flags according to the property spec */
-	if (!validate_flags (setting, prop, (guint) val_int, error))
-		return FALSE;
-
-	g_object_set (setting, prop, (guint) val_int, NULL);
-	return TRUE;
-}
-
-static gboolean
-nmc_property_set_bool (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	gboolean val_bool;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_bool (val, &val_bool, error))
-		return FALSE;
-
-	g_object_set (setting, prop, val_bool, NULL);
-	return TRUE;
-}
-
-static gboolean
-nmc_property_set_trilean (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	long int val_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_int (val, TRUE, -1, 1, &val_int)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid value; use -1, 0 or 1"), val);
-		return FALSE;
-	}
-
-	g_object_set (setting, prop, val_int, NULL);
-	return TRUE;
-}
-
-static gboolean
-nmc_property_set_ssid (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	GBytes *ssid;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (strlen (val) > 32) {
-		g_set_error (error, 1, 0, _("'%s' is not valid"), val);
-		return FALSE;
-	}
-
-	ssid = g_bytes_new (val, strlen (val));
-	g_object_set (setting, prop, ssid, NULL);
-	g_bytes_unref (ssid);
-	return TRUE;
-}
-
-static gboolean
-_property_set_mac (NMSetting *setting, const char *prop, const char *val, gboolean cloned_mac_addr, GError **error)
-{
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (   (!cloned_mac_addr || !NM_CLONED_MAC_IS_SPECIAL (val))
-	    && !nm_utils_hwaddr_valid (val, ETH_ALEN)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid Ethernet MAC"), val);
-		return FALSE;
-	}
-
-	g_object_set (setting, prop, val, NULL);
-	return TRUE;
-}
-
-static gboolean
-nmc_property_set_mac (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return _property_set_mac (setting, prop, val, FALSE, error);
-}
-
-static gboolean
-nmc_property_set_mac_cloned (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return _property_set_mac (setting, prop, val, TRUE, error);
-}
-
-static gboolean
-nmc_property_set_mtu (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	const char *mtu = val;
-
-	if (strcmp (mtu, "auto") == 0)
-		mtu = "0";
-
-	return nmc_property_set_uint (setting, prop, mtu, error);
-}
-
-static gboolean
-nmc_property_set_ifname (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nm_utils_is_valid_iface_name (val, error))
-		return FALSE;
-	g_object_set (setting, prop, val, NULL);
-	return TRUE;
-}
-
-#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)
-
-static gboolean
-nmc_property_set_secret_flags (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	char **strv = NULL, **iter;
-	unsigned long flags = 0, val_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (val, " \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"), val);
-	}
-
-	g_object_set (setting, prop, (guint) flags, NULL);
-	return TRUE;
-}
-
-static gboolean
-nmc_property_set_vpn_service (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	gs_free char *service_name = NULL;
-
-	service_name = nm_vpn_plugin_info_list_find_service_type (nm_vpn_get_plugin_infos (), val);
-	g_object_set (setting, prop, service_name ? : val, NULL);
-	return TRUE;
-}
-
-static gboolean
-nmc_util_is_domain (const char *domain)
-{
-	//FIXME: implement
-	return TRUE;
-}
-
-static gboolean
-nmc_property_set_bytes (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	gs_free char *val_strip = NULL;
-	gs_strfreev char **strv = NULL;
-	const char *delimiters = " \t,";
-	char **iter;
-	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 (val));
-
-	/* First try hex string in the format of AAbbCCDd */
-	bytes = nm_utils_hexstr2bin (val_strip);
-	if (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++) {
-		guint8 v8;
-
-		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);
-			g_byte_array_free (array, TRUE);
-			success = FALSE;
-			goto done;
-		}
-		v8 = val_int;
-		g_byte_array_append (array, &v8, 1);
-	}
-	bytes = g_byte_array_free_to_bytes (array);
-
-done:
-	if (success)
-		g_object_set (setting, prop, bytes, NULL);
-
-	if (bytes)
-		g_bytes_unref (bytes);
-
-	return success;
-}
-
-/* === GetFunc, SetFunc, RemoveFunc, DescribeFunc, ValuesFunc
-       functions for all properties of all settings === */
-
-/* --- NM_SETTING_802_1X_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_802_1X_get_eap, NM_SETTING_802_1X_EAP)
-DEFINE_GETTER (nmc_property_802_1X_get_identity, NM_SETTING_802_1X_IDENTITY)
-DEFINE_GETTER (nmc_property_802_1X_get_anonymous_identity, NM_SETTING_802_1X_ANONYMOUS_IDENTITY)
-DEFINE_GETTER (nmc_property_802_1X_get_pac_file, NM_SETTING_802_1X_PAC_FILE)
-DEFINE_GETTER (nmc_property_802_1X_get_ca_cert_password, NM_SETTING_802_1X_CA_CERT_PASSWORD)
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_ca_cert_password_flags, NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS)
-DEFINE_GETTER (nmc_property_802_1X_get_ca_path, NM_SETTING_802_1X_CA_PATH)
-DEFINE_GETTER (nmc_property_802_1X_get_subject_match, NM_SETTING_802_1X_SUBJECT_MATCH)
-DEFINE_GETTER (nmc_property_802_1X_get_altsubject_matches, NM_SETTING_802_1X_ALTSUBJECT_MATCHES)
-DEFINE_GETTER (nmc_property_802_1X_get_domain_suffix_match, NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH)
-DEFINE_GETTER (nmc_property_802_1X_get_client_cert_password, NM_SETTING_802_1X_CLIENT_CERT_PASSWORD)
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_client_cert_password_flags, NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS)
-DEFINE_GETTER (nmc_property_802_1X_get_phase1_peapver, NM_SETTING_802_1X_PHASE1_PEAPVER)
-DEFINE_GETTER (nmc_property_802_1X_get_phase1_peaplabel, NM_SETTING_802_1X_PHASE1_PEAPLABEL)
-DEFINE_GETTER (nmc_property_802_1X_get_phase1_fast_provisioning, NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING)
-DEFINE_GETTER (nmc_property_802_1X_get_phase2_auth, NM_SETTING_802_1X_PHASE2_AUTH)
-DEFINE_GETTER (nmc_property_802_1X_get_phase2_autheap, NM_SETTING_802_1X_PHASE2_AUTHEAP)
-DEFINE_GETTER (nmc_property_802_1X_get_phase2_ca_cert_password, NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD)
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_phase2_ca_cert_password_flags, NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS)
-DEFINE_GETTER (nmc_property_802_1X_get_phase2_ca_path, NM_SETTING_802_1X_PHASE2_CA_PATH)
-DEFINE_GETTER (nmc_property_802_1X_get_phase2_subject_match, NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH)
-DEFINE_GETTER (nmc_property_802_1X_get_phase2_altsubject_matches, NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES)
-DEFINE_GETTER (nmc_property_802_1X_get_phase2_domain_suffix_match, NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH)
-DEFINE_GETTER (nmc_property_802_1X_get_phase2_client_cert_password, NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD)
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_phase2_client_cert_password_flags, NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS)
-DEFINE_GETTER (nmc_property_802_1X_get_password, NM_SETTING_802_1X_PASSWORD)
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_password_flags, NM_SETTING_802_1X_PASSWORD_FLAGS)
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_password_raw_flags, NM_SETTING_802_1X_PASSWORD_RAW_FLAGS)
-DEFINE_GETTER (nmc_property_802_1X_get_private_key_password, NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD)
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_private_key_password_flags, NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS)
-DEFINE_GETTER (nmc_property_802_1X_get_phase2_private_key_password, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD)
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_phase2_private_key_password_flags, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS)
-DEFINE_GETTER (nmc_property_802_1X_get_pin, NM_SETTING_802_1X_PIN)
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_pin_flags, NM_SETTING_802_1X_PIN_FLAGS)
-DEFINE_GETTER (nmc_property_802_1X_get_system_ca_certs, NM_SETTING_802_1X_SYSTEM_CA_CERTS)
-DEFINE_GETTER (nmc_property_802_1X_get_auth_timeout, NM_SETTING_802_1X_AUTH_TIMEOUT)
-
-static char *
-nmc_property_802_1X_get_ca_cert (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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 *
-nmc_property_802_1X_get_client_cert (NMSetting *setting,
-                                     NmcPropertyGetType get_type,
-                                     gboolean show_secrets)
-{
-	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>"));
-		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 *
-nmc_property_802_1X_get_client_cert_full (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	return nmc_property_802_1X_get_client_cert (setting, get_type, TRUE);
-}
-
-static char *
-nmc_property_802_1X_get_phase2_ca_cert (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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 *
-nmc_property_802_1X_get_phase2_client_cert (NMSetting *setting,
-                                            NmcPropertyGetType get_type,
-                                            gboolean show_secrets)
-{
-	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>"));
-		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 *
-nmc_property_802_1X_get_phase2_client_cert_full (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	return nmc_property_802_1X_get_phase2_client_cert (setting, get_type, TRUE);
-}
-
-static char *
-nmc_property_802_1X_get_password_raw (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
-	return bytes_to_string (nm_setting_802_1x_get_password_raw (s_8021X));
-}
-
-static char *
-nmc_property_802_1X_get_private_key (NMSetting *setting,
-                                     NmcPropertyGetType get_type,
-                                     gboolean show_secrets)
-{
-	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>"));
-		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 *
-nmc_property_802_1X_get_private_key_full (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	return nmc_property_802_1X_get_private_key (setting, get_type, TRUE);
-}
-
-static char *
-nmc_property_802_1X_get_phase2_private_key (NMSetting *setting,
-                                            NmcPropertyGetType get_type,
-                                            gboolean show_secrets)
-{
-	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>"));
-		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;
-}
-
-static char *
-nmc_property_802_1X_get_phase2_private_key_full (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	return nmc_property_802_1X_get_phase2_private_key (setting, get_type, TRUE);
-}
-
-#define DEFINE_SETTER_STR_LIST(def_func, set_func) \
-	static gboolean \
-	def_func (NMSetting *setting, const char *prop, const char *val, GError **error) \
-	{ \
-		char **strv = NULL; \
-		guint i = 0; \
-		\
-		g_return_val_if_fail (error == NULL || *error == NULL, FALSE); \
-		\
-		strv = nmc_strsplit_set (val, " \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 (NMSetting *setting, const char *prop, const char *val, GError **error) \
-	{ \
-		char *val_strip = g_strstrip (g_strdup (val)); \
-		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 (NMSetting *setting, const char *prop, const char *val, GError **error) \
-	{ \
-		char **strv = NULL; \
-		char *val_strip = g_strstrip (g_strdup (val)); \
-		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; \
-	}
-
-/* 'eap' */
-static const char *valid_eap[] = { "leap", "md5", "tls", "peap", "ttls", "sim", "fast", "pwd", NULL };
-
-DEFINE_SETTER_STR_LIST_MULTI (check_and_add_802_1X_eap,
-                              NM_SETTING_802_1X,
-                              nm_setting_802_1x_add_eap_method)
-static gboolean
-nmc_property_802_1X_set_eap (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_add_802_1X_eap (setting, prop, val, valid_eap, error);
-}
-
-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 (nmc_property_802_1X_remove_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_ALLOWED_VAL_FUNC (nmc_property_802_1X_allowed_eap, valid_eap)
-
-/* 'ca-cert' */
-DEFINE_SETTER_CERT (nmc_property_802_1X_set_ca_cert, nm_setting_802_1x_set_ca_cert)
-
-static const char *
-nmc_property_802_1X_describe_ca_cert (NMSetting *setting, const char *prop)
-{
-	return _("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");
-}
-
-/* 'altsubject-matches' */
-DEFINE_SETTER_STR_LIST (nmc_property_802_1X_set_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 (nmc_property_802_1X_remove_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)
-
-/* 'client-cert' */
-DEFINE_SETTER_CERT (nmc_property_802_1X_set_client_cert, nm_setting_802_1x_set_client_cert)
-
-static const char *
-nmc_property_802_1X_describe_client_cert (NMSetting *setting, const char *prop)
-{
-	return _("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");
-}
-
-/* 'phase2-ca-cert' */
-DEFINE_SETTER_CERT (nmc_property_802_1X_set_phase2_ca_cert, nm_setting_802_1x_set_phase2_ca_cert)
-
-static const char *
-nmc_property_802_1X_describe_phase2_ca_cert (NMSetting *setting, const char *prop)
-{
-	return _("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");
-}
-
-/* 'phase2-altsubject-matches' */
-DEFINE_SETTER_STR_LIST (nmc_property_802_1X_set_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 (nmc_property_802_1X_remove_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)
-
-/* 'phase2-client-cert' */
-DEFINE_SETTER_CERT (nmc_property_802_1X_set_phase2_client_cert, nm_setting_802_1x_set_phase2_client_cert)
-
-static const char *
-nmc_property_802_1X_describe_phase2_client_cert (NMSetting *setting, const char *prop)
-{
-	return _("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");
-}
-
-/* 'private-key' */
-DEFINE_SETTER_PRIV_KEY (nmc_property_802_1X_set_private_key,
-                        nm_setting_802_1x_get_private_key_password,
-                        nm_setting_802_1x_set_private_key)
-
-/* 'phase2-private-key' */
-DEFINE_SETTER_PRIV_KEY (nmc_property_802_1X_set_phase2_private_key,
-                        nm_setting_802_1x_get_phase2_private_key_password,
-                        nm_setting_802_1x_set_phase2_private_key)
-
-static const char *
-nmc_property_802_1X_describe_private_key (NMSetting *setting, const char *prop)
-{
-	return _("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");
-}
-
-/* 'phase1-peapver' */
-static const char *_802_1X_valid_phase1_peapvers[] = { "0", "1", NULL };
-
-static gboolean
-nmc_property_802_1X_set_phase1_peapver (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_set_string (setting, prop, val, _802_1X_valid_phase1_peapvers, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_802_1X_allowed_phase1_peapver, _802_1X_valid_phase1_peapvers)
-
-/* 'phase1-peaplabel' */
-static const char *_802_1X_valid_phase1_peaplabels[] = { "0", "1", NULL };
-
-static gboolean
-nmc_property_802_1X_set_phase1_peaplabel (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_set_string (setting, prop, val, _802_1X_valid_phase1_peaplabels, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_802_1X_allowed_phase1_peaplabel, _802_1X_valid_phase1_peaplabels)
-
-/* 'phase1-fast-provisioning' */
-static const char *_802_1X_valid_phase1_fast_provisionings[] = { "0", "1", "2", "3", NULL };
-
-static gboolean
-nmc_property_802_1X_set_phase1_fast_provisioning (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_set_string (setting, prop, val, _802_1X_valid_phase1_fast_provisionings, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_802_1X_allowed_phase1_fast_provisioning, _802_1X_valid_phase1_fast_provisionings)
-
-/* 'phase2-auth' */
-static const char *_802_1X_valid_phase2_auths[] =
-	{ "pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", "tls", NULL };
-
-static gboolean
-nmc_property_802_1X_set_phase2_auth (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_set_string (setting, prop, val, _802_1X_valid_phase2_auths, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_802_1X_allowed_phase2_auth, _802_1X_valid_phase2_auths)
-
-/* 'phase2-autheap' */
-static const char *_802_1X_valid_phase2_autheaps[] = { "md5", "mschapv2", "otp", "gtc", "tls", NULL };
-static gboolean
-nmc_property_802_1X_set_phase2_autheap (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_set_string (setting, prop, val, _802_1X_valid_phase2_autheaps, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_802_1X_allowed_phase2_autheap, _802_1X_valid_phase2_autheaps)
-
-/* 'password-raw' */
-static gboolean
-nmc_property_802_1X_set_password_raw (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return nmc_property_set_bytes (setting, prop, val, error);
-}
-
-static const char *
-nmc_property_802_1X_describe_password_raw (NMSetting *setting, const char *prop)
-{
-	return _("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");
-}
-
-static char *
-nmc_property_802_1X_get_phase1_auth_flags (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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 == NMC_PROPERTY_GET_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
-nmc_property_802_1X_set_phase1_auth_flags (NMSetting *setting, const char *prop,
-                                           const char *val, GError **error)
-{
-	NMSetting8021xAuthFlags flags;
-	gs_free char *err_token = NULL;
-	gboolean ret;
-	long int t;
-
-	if (nmc_string_to_int_base (val, 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 (), val,
-		                              (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, prop, (guint) flags, NULL);
-	return TRUE;
-}
-
-
-/* --- NM_SETTING_ADSL_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_adsl_get_username, NM_SETTING_ADSL_USERNAME)
-DEFINE_GETTER (nmc_property_adsl_get_password, NM_SETTING_ADSL_PASSWORD)
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_adsl_get_password_flags, NM_SETTING_ADSL_PASSWORD_FLAGS)
-DEFINE_GETTER (nmc_property_adsl_get_protocol, NM_SETTING_ADSL_PROTOCOL)
-DEFINE_GETTER (nmc_property_adsl_get_encapsulation, NM_SETTING_ADSL_ENCAPSULATION)
-DEFINE_GETTER (nmc_property_adsl_get_vpi, NM_SETTING_ADSL_VPI)
-DEFINE_GETTER (nmc_property_adsl_get_vci, NM_SETTING_ADSL_VCI)
-
-/* 'protocol' */
-static const char *adsl_valid_protocols[] = {
-	NM_SETTING_ADSL_PROTOCOL_PPPOA,
-	NM_SETTING_ADSL_PROTOCOL_PPPOE,
-	NM_SETTING_ADSL_PROTOCOL_IPOATM,
-	NULL
-};
-
-static gboolean
-nmc_property_adsl_set_protocol (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_set_string (setting, prop, val, adsl_valid_protocols, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_adsl_allowed_protocol, adsl_valid_protocols)
-
-/* 'encapsulation' */
-static const char *adsl_valid_encapsulations[] = {
-	NM_SETTING_ADSL_ENCAPSULATION_VCMUX,
-	NM_SETTING_ADSL_ENCAPSULATION_LLC,
-	NULL
-};
-
-static gboolean
-nmc_property_adsl_set_encapsulation (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_set_string (setting, prop, val, adsl_valid_encapsulations, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_adsl_allowed_encapsulation, adsl_valid_encapsulations)
-
-
-/* --- NM_SETTING_BLUETOOTH_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_bluetooth_get_bdaddr, NM_SETTING_BLUETOOTH_BDADDR)
-DEFINE_GETTER (nmc_property_bluetooth_get_type, NM_SETTING_BLUETOOTH_TYPE)
-
-/* 'type' */
-static gboolean
-nmc_property_bluetooth_set_type (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	const char *types[] = {
-	    NM_SETTING_BLUETOOTH_TYPE_DUN,
-	    NM_SETTING_BLUETOOTH_TYPE_PANU,
-	    NULL };
-
-	return check_and_set_string (setting, prop, val, types, error);
-}
-
-/* --- NM_SETTING_BOND_SETTING_NAME property functions --- */
-/* 'options' */
-static char *
-nmc_property_bond_get_options (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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;
-}
-
-/* Validate bonding 'options' values */
-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 (nmc_property_bond_set_options,
-                       NM_SETTING_BOND,
-                       NMSettingBond,
-                       _bond_add_option,
-                       nm_setting_bond_get_valid_options,
-                       _validate_bond_option_value)
-DEFINE_REMOVER_OPTION (nmc_property_bond_remove_option_options,
-                       NM_SETTING_BOND,
-                       _validate_and_remove_bond_option)
-
-static const char *
-nmc_property_bond_describe_options (NMSetting *setting, const char *prop)
-{
-	static char *desc = NULL;
-	const char **valid_options;
-	char *options_str;
-
-	if (G_UNLIKELY (desc == NULL)) {
-		valid_options = nm_setting_bond_get_valid_options (NM_SETTING_BOND (setting));
-		options_str = g_strjoinv (", ", (char **) valid_options);
-
-		desc = 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);
-		g_free (options_str);
-	}
-	return desc;
-}
-
-static const char **
-nmc_property_bond_allowed_options (NMSetting *setting, const char *prop)
-{
-	return nm_setting_bond_get_valid_options (NM_SETTING_BOND (setting));
-}
-
-
-/* --- NM_SETTING_BRIDGE_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_bridge_get_mac_address, NM_SETTING_BRIDGE_MAC_ADDRESS)
-DEFINE_GETTER (nmc_property_bridge_get_stp, NM_SETTING_BRIDGE_STP)
-DEFINE_GETTER (nmc_property_bridge_get_priority, NM_SETTING_BRIDGE_PRIORITY)
-DEFINE_GETTER (nmc_property_bridge_get_forward_delay, NM_SETTING_BRIDGE_FORWARD_DELAY)
-DEFINE_GETTER (nmc_property_bridge_get_hello_time, NM_SETTING_BRIDGE_HELLO_TIME)
-DEFINE_GETTER (nmc_property_bridge_get_max_age, NM_SETTING_BRIDGE_MAX_AGE)
-DEFINE_GETTER (nmc_property_bridge_get_ageing_time, NM_SETTING_BRIDGE_AGEING_TIME)
-DEFINE_GETTER (nmc_property_bridge_get_multicast_snooping, NM_SETTING_BRIDGE_MULTICAST_SNOOPING)
-
-
-/* --- NM_SETTING_BRIDGE_PORT_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_bridge_port_get_priority, NM_SETTING_BRIDGE_PORT_PRIORITY)
-DEFINE_GETTER (nmc_property_bridge_port_get_path_cost, NM_SETTING_BRIDGE_PORT_PATH_COST)
-DEFINE_GETTER (nmc_property_bridge_port_get_hairpin_mode, NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE)
-
-
-/* --- NM_SETTING_CDMA_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_cdma_get_number, NM_SETTING_CDMA_NUMBER)
-DEFINE_GETTER (nmc_property_cdma_get_username, NM_SETTING_CDMA_USERNAME)
-DEFINE_GETTER (nmc_property_cdma_get_password, NM_SETTING_CDMA_PASSWORD)
-DEFINE_GETTER (nmc_property_cdma_get_mtu, NM_SETTING_CDMA_MTU)
-
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_cdma_get_password_flags, NM_SETTING_CDMA_PASSWORD_FLAGS)
-
 
-/* --- NM_SETTING_CONNECTION_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_connection_get_id, NM_SETTING_CONNECTION_ID)
-DEFINE_GETTER (nmc_property_connection_get_uuid, NM_SETTING_CONNECTION_UUID)
-DEFINE_GETTER (nmc_property_connection_get_stable_id, NM_SETTING_CONNECTION_STABLE_ID)
-DEFINE_GETTER (nmc_property_connection_get_interface_name, NM_SETTING_CONNECTION_INTERFACE_NAME)
-DEFINE_GETTER (nmc_property_connection_get_type, NM_SETTING_CONNECTION_TYPE)
-DEFINE_GETTER (nmc_property_connection_get_autoconnect, NM_SETTING_CONNECTION_AUTOCONNECT)
-DEFINE_GETTER (nmc_property_connection_get_autoconnect_priority, NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY)
-DEFINE_GETTER (nmc_property_connection_get_timestamp, NM_SETTING_CONNECTION_TIMESTAMP)
-DEFINE_GETTER (nmc_property_connection_get_read_only, NM_SETTING_CONNECTION_READ_ONLY)
-
-static char *
-nmc_property_connection_get_autoconnect_retries (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	NMSettingConnection *s_con = NM_SETTING_CONNECTION (setting);
-	gint retries;
-
-	retries = nm_setting_connection_get_autoconnect_retries (s_con);
-	if (get_type == NMC_PROPERTY_GET_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 *
-nmc_property_connection_get_permissions (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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);
-}
-
-DEFINE_GETTER (nmc_property_connection_get_zone, NM_SETTING_CONNECTION_ZONE)
-DEFINE_GETTER (nmc_property_connection_get_master, NM_SETTING_CONNECTION_MASTER)
-DEFINE_GETTER (nmc_property_connection_get_slave_type, NM_SETTING_CONNECTION_SLAVE_TYPE)
-
-static char *
-nmc_property_connection_get_autoconnect_slaves (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	NMSettingConnection *s_con = NM_SETTING_CONNECTION (setting);
-	return autoconnect_slaves_to_string (nm_setting_connection_get_autoconnect_slaves (s_con), get_type);
-}
-
-DEFINE_GETTER (nmc_property_connection_get_secondaries, NM_SETTING_CONNECTION_SECONDARIES)
-DEFINE_GETTER (nmc_property_connection_get_gateway_ping_timeout, NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT)
-
-static gboolean
-nmc_property_connection_set_type (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	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), prop, val, NULL);
-	return TRUE;
-}
-
-#if 0
-/*
- * Setting/removing UUID has been forbidden.
- * Should it be enabled later, this function can be used.
- */
-static gboolean
-nmc_property_con_set_uuid (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nm_utils_is_uuid (val)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid UUID"), val);
-		return FALSE;
-	}
-	g_object_set (setting, prop, val, NULL);
-	return TRUE;
-}
-#endif
-
-/* 'permissions' */
-/* 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
-nmc_property_connection_set_permissions (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	char **strv = NULL;
-	guint i = 0;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (val, " \t,", 0);
-	if (!verify_string_list (strv, prop, 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 (nmc_property_connection_remove_permissions,
-                               NM_SETTING_CONNECTION,
-                               nm_setting_connection_get_num_permissions,
-                               nm_setting_connection_remove_permission,
-                               _validate_and_remove_connection_permission)
-
-static const char *
-nmc_property_connection_describe_permissions (NMSetting *setting, const char *prop)
-{
-	return _("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");
-}
-
-/* 'master' */
-static gboolean
-nmc_property_con_set_master (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!val)
-		;
-	else if (!*val)
-		val = NULL;
-	else if (   !nm_utils_is_valid_iface_name (val, NULL)
-	         && !nm_utils_is_uuid (val)) {
-		g_set_error (error, 1, 0,
-		             _("'%s' is not valid master; use ifname or connection UUID"),
-		             val);
-		return FALSE;
-	}
-	g_object_set (setting, prop, val, NULL);
-	return TRUE;
-}
-
-/* 'slave-type' */
-static const char *con_valid_slave_types[] = {
-	NM_SETTING_BOND_SETTING_NAME,
-	NM_SETTING_BRIDGE_SETTING_NAME,
-	NM_SETTING_TEAM_SETTING_NAME,
-	NULL
-};
-
-static gboolean
-nmc_property_con_set_slave_type (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_set_string (setting, prop, val, con_valid_slave_types, error);
-}
-
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_con_allowed_slave_type, con_valid_slave_types)
-
-/* 'secondaries' */
-static gboolean
-nmc_property_connection_set_secondaries (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	const GPtrArray *connections;
-	NMConnection *con;
-	char **strv = NULL, **iter;
-	guint i = 0;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	connections = nm_client_get_connections (nm_cli.client);
-	strv = nmc_strsplit_set (val, " \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 (nmc_property_connection_remove_secondaries,
-                               NM_SETTING_CONNECTION,
-                               nm_setting_connection_get_num_secondaries,
-                               nm_setting_connection_remove_secondary,
-                               _validate_and_remove_connection_secondary)
-
-static const char *
-nmc_property_connection_describe_secondaries (NMSetting *setting, const char *prop)
-{
-	return _("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");
-}
-
-/* 'metered' */
-static char *
-nmc_property_connection_get_metered (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	NMSettingConnection *s_conn = NM_SETTING_CONNECTION (setting);
-
-	if (get_type == NMC_PROPERTY_GET_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
-nmc_property_connection_set_metered (NMSetting *setting, const char *prop,
-                                     const char *val, GError **error)
-{
-	NMMetered metered;
-	NMCTriStateValue ts_val;
-
-	if (!nmc_string_to_tristate (val, &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, prop, metered, NULL);
-	return TRUE;
-}
-
-static const char *
-nmc_property_connection_describe_metered (NMSetting *setting, const char *prop)
-{
-	return _("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");
-}
-
-static const char *metered_valid_values[] = { "yes", "no", "unknown", NULL };
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_connection_allowed_metered, metered_valid_values)
-
-/* 'lldp' */
-static char *
-nmc_property_connection_get_lldp (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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 == NMC_PROPERTY_GET_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
-nmc_property_connection_set_lldp (NMSetting *setting, const char *prop,
-                                  const char *val, GError **error)
-{
-	NMSettingConnectionLldp lldp;
-	gboolean ret;
-	long int t;
-
-	if (nmc_string_to_int_base (val, 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 (), val,
-		                              (int *) &lldp, NULL);
-
-		if (!ret) {
-			if (g_ascii_strcasecmp (val, "enable") == 0)
-				lldp = NM_SETTING_CONNECTION_LLDP_ENABLE_RX;
-			else {
-				g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
-				             val, "default,disable,enable-rx,enable");
-				return FALSE;
-			}
-		}
-	}
-
-	g_object_set (setting, prop, lldp, NULL);
-	return TRUE;
-}
-
-static const char *lldp_valid_values[] = { "default", "disable", "enable-rx", NULL };
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_connection_allowed_lldp, lldp_valid_values)
-
-
-/* --- NM_SETTING_DCB_SETTING_NAME property functions --- */
-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 (NMSetting *setting, NmcPropertyGetType get_type) \
-	{ \
-		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 (NMSetting *setting, NmcPropertyGetType get_type) \
-	{ \
-		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 (NMSetting *setting, NmcPropertyGetType get_type) \
-	{ \
-		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 (NMSetting *setting, NmcPropertyGetType get_type) \
-	{ \
-		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 (nmc_property_dcb_get_app_fcoe_flags, NM_SETTING_DCB_APP_FCOE_FLAGS)
-DEFINE_DCB_APP_PRIORITY_GETTER (nmc_property_dcb_get_app_fcoe_priority, NM_SETTING_DCB_APP_FCOE_PRIORITY)
-DEFINE_GETTER (nmc_property_dcb_get_app_fcoe_mode, NM_SETTING_DCB_APP_FCOE_MODE)
-DEFINE_DCB_FLAGS_GETTER (nmc_property_dcb_get_app_iscsi_flags, NM_SETTING_DCB_APP_ISCSI_FLAGS)
-DEFINE_DCB_APP_PRIORITY_GETTER (nmc_property_dcb_get_app_iscsi_priority, NM_SETTING_DCB_APP_ISCSI_PRIORITY)
-DEFINE_DCB_FLAGS_GETTER (nmc_property_dcb_get_app_fip_flags, NM_SETTING_DCB_APP_FIP_FLAGS)
-DEFINE_DCB_APP_PRIORITY_GETTER (nmc_property_dcb_get_app_fip_priority, NM_SETTING_DCB_APP_FIP_PRIORITY)
-
-DEFINE_DCB_FLAGS_GETTER (nmc_property_dcb_get_pfc_flags, NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS)
-DEFINE_DCB_BOOL_GETTER (nmc_property_dcb_get_pfc, nm_setting_dcb_get_priority_flow_control)
-
-DEFINE_DCB_FLAGS_GETTER (nmc_property_dcb_get_pg_flags, NM_SETTING_DCB_PRIORITY_GROUP_FLAGS)
-DEFINE_DCB_UINT_GETTER (nmc_property_dcb_get_pg_group_id, nm_setting_dcb_get_priority_group_id)
-DEFINE_DCB_UINT_GETTER (nmc_property_dcb_get_pg_group_bandwidth, nm_setting_dcb_get_priority_group_bandwidth)
-DEFINE_DCB_UINT_GETTER (nmc_property_dcb_get_pg_bandwidth, nm_setting_dcb_get_priority_bandwidth)
-DEFINE_DCB_BOOL_GETTER (nmc_property_dcb_get_pg_strict, nm_setting_dcb_get_priority_strict_bandwidth)
-DEFINE_DCB_UINT_GETTER (nmc_property_dcb_get_pg_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
-nmc_property_dcb_set_flags (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	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 (val, 0, TRUE, 0, DCB_ALL_FLAGS, &t))
-		flags = (guint) t;
-	else {
-		/* Check for individual flag numbers */
-		strv = nmc_strsplit_set (val, " \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, prop, (guint) flags, error))
-		return FALSE;
-
-	g_object_set (setting, prop, (guint) flags, NULL);
-	return TRUE;
-}
-
-static gboolean
-nmc_property_dcb_set_priority (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	long int priority = 0;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_int (val, FALSE, -1, 7, &priority)) {
-		g_set_error (error, 1, 0, _("'%s' is not a DCB app priority"), val);
-		return FALSE;
-	}
-
-	/* Validate the number according to the property spec */
-	if (!validate_int (setting, prop, (gint) priority, error))
-		return FALSE;
-
-	g_object_set (setting, prop, (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
-nmc_property_dcb_set_pfc (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	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 (val, 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
-nmc_property_dcb_set_pg_group_id (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	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 (val, 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
-nmc_property_dcb_set_pg_group_bandwidth (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	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 (val, 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
-nmc_property_dcb_set_pg_bandwidth (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	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 (val, 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
-nmc_property_dcb_set_pg_strict (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	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 (val, 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
-nmc_property_dcb_set_pg_traffic_class (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	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 (val, 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;
-}
-
-/* 'app-fcoe-mode' */
-static const char *_dcb_valid_fcoe_modes[] = { NM_SETTING_DCB_FCOE_MODE_FABRIC,
-                                               NM_SETTING_DCB_FCOE_MODE_VN2VN,
-                                               NULL };
-
-static gboolean
-nmc_property_dcb_set_app_fcoe_mode (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_set_string (setting, prop, val, _dcb_valid_fcoe_modes, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_dcb_allowed_app_fcoe_modes, _dcb_valid_fcoe_modes)
-
-
-/* --- NM_SETTING_GSM_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_gsm_get_number, NM_SETTING_GSM_NUMBER)
-DEFINE_GETTER (nmc_property_gsm_get_username, NM_SETTING_GSM_USERNAME)
-DEFINE_GETTER (nmc_property_gsm_get_password, NM_SETTING_GSM_PASSWORD)
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_gsm_get_password_flags, NM_SETTING_GSM_PASSWORD_FLAGS)
-DEFINE_GETTER (nmc_property_gsm_get_apn, NM_SETTING_GSM_APN)
-DEFINE_GETTER (nmc_property_gsm_get_network_id, NM_SETTING_GSM_NETWORK_ID)
-DEFINE_GETTER (nmc_property_gsm_get_pin, NM_SETTING_GSM_PIN)
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_gsm_get_pin_flags, NM_SETTING_GSM_PIN_FLAGS)
-DEFINE_GETTER (nmc_property_gsm_get_home_only, NM_SETTING_GSM_HOME_ONLY)
-DEFINE_GETTER (nmc_property_gsm_get_device_id, NM_SETTING_GSM_DEVICE_ID)
-DEFINE_GETTER (nmc_property_gsm_get_sim_id, NM_SETTING_GSM_SIM_ID)
-DEFINE_GETTER (nmc_property_gsm_get_sim_operator_id, NM_SETTING_GSM_SIM_OPERATOR_ID)
-DEFINE_GETTER (nmc_property_gsm_get_mtu, NM_SETTING_GSM_MTU)
-
-static gboolean
-nmc_property_gsm_set_sim_operator_id (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	const char *p = val;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (strlen (val) != 5 && strlen (val) != 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,
-	              val,
-	              NULL);
-	return TRUE;
-}
-
-
-/* --- NM_SETTING_INFINIBAND_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_ib_get_mac_address, NM_SETTING_INFINIBAND_MAC_ADDRESS)
-DEFINE_GETTER (nmc_property_ib_get_transport_mode, NM_SETTING_INFINIBAND_TRANSPORT_MODE)
-
-/* 'mac-address' */
-static gboolean
-nmc_property_ib_set_mac (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nm_utils_hwaddr_valid (val, INFINIBAND_ALEN)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid InfiniBand MAC"), val);
-		return FALSE;
-	}
-
-	g_object_set (setting, prop, val, NULL);
-	return TRUE;
-}
-
-/* 'transport-mode' */
-static const char *ib_valid_transport_modes[] = { "datagram", "connected", NULL };
-
-static gboolean
-nmc_property_ib_set_transport_mode (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_set_string (setting, prop, val, ib_valid_transport_modes, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_ib_allowed_transport_mode, ib_valid_transport_modes)
-
-/* 'p-key' */
-static gboolean
-nmc_property_ib_set_p_key (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	gboolean p_key_valid = FALSE;
-	long p_key_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!strncasecmp (val, "0x", 2))
-		p_key_valid = nmc_string_to_int_base (val + 2, 16, TRUE, 0, G_MAXUINT16, &p_key_int);
-	else
-		p_key_valid = nmc_string_to_int (val, TRUE, -1, G_MAXUINT16, &p_key_int);
-
-	if (!p_key_valid) {
-		if (strcmp (val, "default") == 0)
-			p_key_int = -1;
-		else {
-			g_set_error (error, 1, 0, _("'%s' is not a valid IBoIP P_Key"), val);
-			return FALSE;
-		}
-	}
-	g_object_set (setting, prop, (gint) p_key_int, NULL);
-	return TRUE;
-}
-
-
-static char *
-nmc_property_ib_get_mtu (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	NMSettingInfiniband *s_infiniband = NM_SETTING_INFINIBAND (setting);
-	int mtu;
-
-	mtu = nm_setting_infiniband_get_mtu (s_infiniband);
-	if (mtu == 0)
-		return g_strdup (_("auto"));
-	else
-		return g_strdup_printf ("%d", mtu);
-}
-
-static char *
-nmc_property_ib_get_p_key (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	NMSettingInfiniband *s_infiniband = NM_SETTING_INFINIBAND (setting);
-	int p_key;
-
-	p_key = nm_setting_infiniband_get_p_key (s_infiniband);
-	if (p_key == -1)
-		return g_strdup (_("default"));
-	else
-		return g_strdup_printf ("0x%04x", p_key);
-}
-
-DEFINE_GETTER (nmc_property_ib_get_parent, NM_SETTING_INFINIBAND_PARENT)
-
-
-/* --- NM_SETTING_IP_TUNNEL_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_ip_tunnel_get_parent, NM_SETTING_IP_TUNNEL_PARENT);
-DEFINE_GETTER (nmc_property_ip_tunnel_get_local, NM_SETTING_IP_TUNNEL_LOCAL);
-DEFINE_GETTER (nmc_property_ip_tunnel_get_remote, NM_SETTING_IP_TUNNEL_REMOTE);
-DEFINE_GETTER (nmc_property_ip_tunnel_get_ttl, NM_SETTING_IP_TUNNEL_TTL);
-DEFINE_GETTER (nmc_property_ip_tunnel_get_tos, NM_SETTING_IP_TUNNEL_TOS);
-DEFINE_GETTER (nmc_property_ip_tunnel_get_path_mtu_discovery, NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY);
-DEFINE_GETTER (nmc_property_ip_tunnel_get_input_key, NM_SETTING_IP_TUNNEL_INPUT_KEY);
-DEFINE_GETTER (nmc_property_ip_tunnel_get_output_key, NM_SETTING_IP_TUNNEL_OUTPUT_KEY);
-DEFINE_GETTER (nmc_property_ip_tunnel_get_encapsulation_limit, NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT);
-DEFINE_GETTER (nmc_property_ip_tunnel_get_flow_label, NM_SETTING_IP_TUNNEL_FLOW_LABEL);
-DEFINE_GETTER (nmc_property_ip_tunnel_get_mtu, NM_SETTING_IP_TUNNEL_MTU);
-
-static char *
-nmc_property_ip_tunnel_get_mode (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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
-nmc_property_ip_tunnel_set_mode (NMSetting *setting, const char *prop,
-                                  const char *val, GError **error)
-{
-	NMIPTunnelMode mode;
-	gboolean ret;
-
-	ret = nm_utils_enum_from_str (nm_ip_tunnel_mode_get_type(), val,
-	                               (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"),
-		             val, values_str);
-
-		return FALSE;
-	}
-
-	g_object_set (setting, prop, mode, NULL);
-	return TRUE;
-}
-
-DEFINE_ALLOWED_FOR_ENUMS (nmc_property_ip_tunnel_allowed_mode,
-                          nm_ip_tunnel_mode_get_type,
-                          NM_IP_TUNNEL_MODE_UNKNOWN + 1, G_MAXINT)
-
-
-/* --- NM_SETTING_IP4_CONFIG_SETTING_NAME property functions --- */
-/* --- IP4 / IP6 shared functions --- */
-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;
-}
-
-DEFINE_GETTER (nmc_property_ipv4_get_method, NM_SETTING_IP_CONFIG_METHOD)
-DEFINE_GETTER (nmc_property_ipv4_get_dns, NM_SETTING_IP_CONFIG_DNS)
-DEFINE_GETTER (nmc_property_ipv4_get_dns_search, NM_SETTING_IP_CONFIG_DNS_SEARCH)
-DEFINE_GETTER_WITH_DEFAULT (nmc_property_ipv4_get_dns_options, NM_SETTING_IP_CONFIG_DNS_OPTIONS, !nm_setting_ip_config_has_dns_options ((NMSettingIPConfig *) setting))
-DEFINE_GETTER (nmc_property_ipv4_get_dns_priority, NM_SETTING_IP_CONFIG_DNS_PRIORITY)
-
-static char *
-nmc_property_ip_get_addresses (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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 *
-nmc_property_ipvx_get_routes (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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 == NMC_PROPERTY_GET_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 *
-nmc_property_ipv4_get_routes (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	return nmc_property_ipvx_get_routes (setting, get_type);
-}
-
-DEFINE_GETTER (nmc_property_ipv4_get_gateway, NM_SETTING_IP_CONFIG_GATEWAY)
-DEFINE_GETTER (nmc_property_ipv4_get_route_metric, NM_SETTING_IP_CONFIG_ROUTE_METRIC)
-DEFINE_GETTER (nmc_property_ipv4_get_ignore_auto_routes, NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES)
-DEFINE_GETTER (nmc_property_ipv4_get_ignore_auto_dns, NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS)
-DEFINE_GETTER (nmc_property_ipv4_get_dhcp_client_id, NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID)
-DEFINE_GETTER (nmc_property_ipv4_get_dhcp_timeout, NM_SETTING_IP_CONFIG_DHCP_TIMEOUT)
-DEFINE_GETTER (nmc_property_ipv4_get_dhcp_send_hostname, NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME)
-DEFINE_GETTER (nmc_property_ipv4_get_dhcp_hostname, NM_SETTING_IP_CONFIG_DHCP_HOSTNAME)
-DEFINE_GETTER (nmc_property_ipv4_get_dhcp_fqdn, NM_SETTING_IP4_CONFIG_DHCP_FQDN)
-DEFINE_GETTER (nmc_property_ipv4_get_never_default, NM_SETTING_IP_CONFIG_NEVER_DEFAULT)
-DEFINE_GETTER (nmc_property_ipv4_get_may_fail, NM_SETTING_IP_CONFIG_MAY_FAIL)
-
-static char *
-nmc_property_ipv4_get_dad_timeout (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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 == NMC_PROPERTY_GET_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);
-	}
-}
-
-/* 'method' */
-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
-nmc_property_ipv4_set_method (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	/* Silently accept "static" and convert to "manual" */
-	if (val && strlen (val) > 1 && matches (val, "static"))
-		val = NM_SETTING_IP4_CONFIG_METHOD_MANUAL;
-
-	return check_and_set_string (setting, prop, val, ipv4_valid_methods, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_ipv4_allowed_method, ipv4_valid_methods)
-
-/* 'dns' */
-static gboolean
-nmc_property_ipv4_set_dns (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	char **strv = NULL, **iter, *addr;
-	guint32 ip4_addr;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (val, " \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 (nmc_property_ipv4_remove_dns,
-                               NM_SETTING_IP_CONFIG,
-                               nm_setting_ip_config_get_num_dns,
-                               nm_setting_ip_config_remove_dns,
-                               _validate_and_remove_ipv4_dns)
-
-static const char *
-nmc_property_ipv4_describe_dns (NMSetting *setting, const char *prop)
-{
-	return _("Enter a list of IPv4 addresses of DNS servers.\n\n"
-	         "Example: 8.8.8.8, 8.8.4.4\n");
-}
-
-/* 'dns-search' */
-static gboolean
-nmc_property_ipv4_set_dns_search (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	char **strv = NULL;
-	guint i = 0;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (val, " \t,", 0);
-	if (!verify_string_list (strv, prop, 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 (nmc_property_ipv4_remove_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)
-
-/* 'dns-options' */
-static gboolean
-nmc_property_ipv4_set_dns_options (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	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 (val, " \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 (nmc_property_ipv4_remove_dns_option,
-                               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)
-
-/* 'addresses' */
-static NMIPAddress *
-_parse_ipv4_address (const char *address, GError **error)
-{
-	return _parse_ip_address (AF_INET, address, error);
-}
-
-static gboolean
-nmc_property_ipv4_set_addresses (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	char **strv = NULL, **iter;
-	NMIPAddress *ip4addr;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (val, ",", 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 (nmc_property_ipv4_remove_addresses,
-                               NM_SETTING_IP_CONFIG,
-                               nm_setting_ip_config_get_num_addresses,
-                               nm_setting_ip_config_remove_address,
-                               _validate_and_remove_ipv4_address)
-
-static const char *
-nmc_property_ipv4_describe_addresses (NMSetting *setting, const char *prop)
-{
-	return _("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");
-}
-
-/* 'gateway' */
-static gboolean
-nmc_property_ipv4_set_gateway (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	NMIPAddress *ip4addr;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (strchr (val, '/')) {
-		g_set_error (error, 1, 0,
-	                     _("invalid gateway address '%s'"), val);
-		return FALSE;
-	}
-	ip4addr = _parse_ipv4_address (val, error);
-	if (!ip4addr)
-		return FALSE;
-
-	g_object_set (setting, prop, val, NULL);
-	nm_ip_address_unref (ip4addr);
-	return TRUE;
-}
-
-/* 'routes' */
-static NMIPRoute *
-_parse_ipv4_route (const char *route, GError **error)
-{
-	return nmc_parse_and_build_route (AF_INET, route, error);
-}
-
-static gboolean
-nmc_property_ipv4_set_routes (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	char **strv = NULL, **iter;
-	NMIPRoute *ip4route;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (val, ",", 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 (nmc_property_ipv4_remove_routes,
-                               NM_SETTING_IP_CONFIG,
-                               nm_setting_ip_config_get_num_routes,
-                               nm_setting_ip_config_remove_route,
-                               _validate_and_remove_ipv4_route)
-
-static const char *
-nmc_property_ipv4_describe_routes (NMSetting *setting, const char *prop)
-{
-	return _("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");
-}
-
-
-/* --- NM_SETTING_IP6_CONFIG_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_ipv6_get_method, NM_SETTING_IP_CONFIG_METHOD)
-DEFINE_GETTER (nmc_property_ipv6_get_dns, NM_SETTING_IP_CONFIG_DNS)
-DEFINE_GETTER (nmc_property_ipv6_get_dns_search, NM_SETTING_IP_CONFIG_DNS_SEARCH)
-DEFINE_GETTER_WITH_DEFAULT (nmc_property_ipv6_get_dns_options, NM_SETTING_IP_CONFIG_DNS_OPTIONS, !nm_setting_ip_config_has_dns_options ((NMSettingIPConfig *) setting))
-DEFINE_GETTER (nmc_property_ipv6_get_dns_priority, NM_SETTING_IP_CONFIG_DNS_PRIORITY)
-
-static char *
-nmc_property_ipv6_get_routes (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	return nmc_property_ipvx_get_routes (setting, get_type);
-}
-
-DEFINE_GETTER (nmc_property_ipv6_get_gateway, NM_SETTING_IP_CONFIG_GATEWAY)
-DEFINE_GETTER (nmc_property_ipv6_get_route_metric, NM_SETTING_IP_CONFIG_ROUTE_METRIC)
-DEFINE_GETTER (nmc_property_ipv6_get_ignore_auto_routes, NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES)
-DEFINE_GETTER (nmc_property_ipv6_get_ignore_auto_dns, NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS)
-DEFINE_GETTER (nmc_property_ipv6_get_never_default, NM_SETTING_IP_CONFIG_NEVER_DEFAULT)
-DEFINE_GETTER (nmc_property_ipv6_get_may_fail, NM_SETTING_IP_CONFIG_MAY_FAIL)
-DEFINE_GETTER (nmc_property_ipv6_get_dhcp_send_hostname, NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME)
-DEFINE_GETTER (nmc_property_ipv6_get_dhcp_hostname, NM_SETTING_IP_CONFIG_DHCP_HOSTNAME)
-DEFINE_GETTER (nmc_property_ipv6_get_token, NM_SETTING_IP6_CONFIG_TOKEN)
-
-static char *
-nmc_property_ipv6_get_ip6_privacy (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	NMSettingIP6Config *s_ip6 = NM_SETTING_IP6_CONFIG (setting);
-	return ip6_privacy_to_string (nm_setting_ip6_config_get_ip6_privacy (s_ip6), get_type);
-}
-
-/* 'method' */
-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
-nmc_property_ipv6_set_method (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	/* Silently accept "static" and convert to "manual" */
-	if (val && strlen (val) > 1 && matches (val, "static"))
-		val = NM_SETTING_IP6_CONFIG_METHOD_MANUAL;
-
-	return check_and_set_string (setting, prop, val, ipv6_valid_methods, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_ipv6_allowed_method, ipv6_valid_methods)
-
-/* 'dns' */
-static gboolean
-nmc_property_ipv6_set_dns (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	char **strv = NULL, **iter, *addr;
-	struct in6_addr ip6_addr;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (val, " \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 (nmc_property_ipv6_remove_dns,
-                               NM_SETTING_IP_CONFIG,
-                               nm_setting_ip_config_get_num_dns,
-                               nm_setting_ip_config_remove_dns,
-                               _validate_and_remove_ipv6_dns)
-
-static const char *
-nmc_property_ipv6_describe_dns (NMSetting *setting, const char *prop)
-{
-	return _("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");
-}
-
-/* 'dns-search' */
-static gboolean
-nmc_property_ipv6_set_dns_search (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	char **strv = NULL;
-	guint i = 0;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (val, " \t,", 0);
-	if (!verify_string_list (strv, prop, 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 (nmc_property_ipv6_remove_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)
-
-/* 'dns-options' */
-static gboolean
-nmc_property_ipv6_set_dns_options (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	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 (val, " \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 (nmc_property_ipv6_remove_dns_option,
-                               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)
-
-/* 'addresses' */
-static NMIPAddress *
-_parse_ipv6_address (const char *address, GError **error)
-{
-	return _parse_ip_address (AF_INET6, address, error);
-}
-
-static gboolean
-nmc_property_ipv6_set_addresses (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	char **strv = NULL, **iter;
-	NMIPAddress *ip6addr;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (val, ",", 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 (nmc_property_ipv6_remove_addresses,
-                               NM_SETTING_IP_CONFIG,
-                               nm_setting_ip_config_get_num_addresses,
-                               nm_setting_ip_config_remove_address,
-                               _validate_and_remove_ipv6_address)
-
-static const char *
-nmc_property_ipv6_describe_addresses (NMSetting *setting, const char *prop)
-{
-	return _("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");
-}
-
-/* 'gateway' */
-static gboolean
-nmc_property_ipv6_set_gateway (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	NMIPAddress *ip6addr;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (strchr (val, '/')) {
-		g_set_error (error, 1, 0,
-	                     _("invalid gateway address '%s'"), val);
-		return FALSE;
-	}
-	ip6addr = _parse_ipv6_address (val, error);
-	if (!ip6addr)
-		return FALSE;
-
-	g_object_set (setting, prop, val, NULL);
-	nm_ip_address_unref (ip6addr);
-	return TRUE;
-}
-
-/* 'routes' */
-static NMIPRoute *
-_parse_ipv6_route (const char *route, GError **error)
-{
-	return nmc_parse_and_build_route (AF_INET6, route, error);
-}
-
-static gboolean
-nmc_property_ipv6_set_routes (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	char **strv = NULL, **iter;
-	NMIPRoute *ip6route;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	strv = nmc_strsplit_set (val, ",", 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 (nmc_property_ipv6_remove_routes,
-                               NM_SETTING_IP_CONFIG,
-                               nm_setting_ip_config_get_num_routes,
-                               nm_setting_ip_config_remove_route,
-                               _validate_and_remove_ipv6_route)
-
-static const char *
-nmc_property_ipv6_describe_routes (NMSetting *setting, const char *prop)
-{
-	return _("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");
-}
-
-static gboolean
-nmc_property_ipv6_set_ip6_privacy (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	unsigned long val_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_uint (val, FALSE, 0, 0, &val_int)) {
-		g_set_error (error, 1, 0, _("'%s' is not a number"), val);
-		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"), val);
-		return FALSE;
-	}
-
-	g_object_set (setting, prop, val_int, NULL);
-	return TRUE;
-}
-
-/* 'addr_gen_mode' */
-static char *
-nmc_property_ipv6_get_addr_gen_mode (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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
-nmc_property_ipv6_set_addr_gen_mode (NMSetting *setting, const char *prop,
-                                     const char *val, GError **error)
-{
-	NMSettingIP6ConfigAddrGenMode addr_gen_mode;
-
-	if (!nm_utils_enum_from_str (nm_setting_ip6_config_addr_gen_mode_get_type (), val,
-	                             (int *) &addr_gen_mode, NULL)) {
-		g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
-		             val, "eui64,stable-privacy");
-			return FALSE;
-	}
-
-	g_object_set (setting, prop, addr_gen_mode, NULL);
-	return TRUE;
-}
-
-DEFINE_ALLOWED_FOR_ENUMS (nmc_property_ipv6_allowed_addr_gen_mode,
-                          nm_setting_ip6_config_addr_gen_mode_get_type,
-                          G_MININT, G_MAXINT)
-
-
-/* --- NM_SETTING_MACSEC_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_macsec_get_parent, NM_SETTING_MACSEC_PARENT)
-DEFINE_GETTER (nmc_property_macsec_get_encrypt, NM_SETTING_MACSEC_ENCRYPT)
-DEFINE_GETTER (nmc_property_macsec_get_mka_cak, NM_SETTING_MACSEC_MKA_CAK)
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_macsec_get_mka_cak_flags, NM_SETTING_MACSEC_MKA_CAK_FLAGS)
-DEFINE_GETTER (nmc_property_macsec_get_mka_ckn, NM_SETTING_MACSEC_MKA_CKN)
-DEFINE_GETTER (nmc_property_macsec_get_port, NM_SETTING_MACSEC_PORT)
-
-/* 'mode' */
-static char *
-nmc_property_macsec_get_mode (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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
-nmc_property_macsec_set_mode (NMSetting *setting, const char *prop,
-                              const char *val, GError **error)
-{
-	NMSettingMacsecMode mode;
-	gs_free char *options = NULL;
-
-	if (!nm_utils_enum_from_str (nm_setting_macsec_mode_get_type (), val,
-	                             (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]"),
-		             val, options);
-			return FALSE;
-	}
-
-	g_object_set (setting, prop, mode, NULL);
-	return TRUE;
-}
-
-DEFINE_ALLOWED_FOR_ENUMS (nmc_property_macsec_allowed_mode,
-                          nm_setting_macsec_mode_get_type,
-                          G_MININT, G_MAXINT)
-
-/* 'validation' */
-static char *
-nmc_property_macsec_get_validation (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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
-nmc_property_macsec_set_validation (NMSetting *setting, const char *prop,
-                                    const char *val, GError **error)
-{
-	NMSettingMacsecMode validation;
-	gs_free char *options = NULL;
-
-	if (!nm_utils_enum_from_str (nm_setting_macsec_validation_get_type (), val,
-	                             (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]"),
-		             val, options);
-			return FALSE;
-	}
-
-	g_object_set (setting, prop, validation, NULL);
-	return TRUE;
-}
-
-DEFINE_ALLOWED_FOR_ENUMS (nmc_property_macsec_allowed_validation,
-                          nm_setting_macsec_validation_get_type,
-                          G_MININT, G_MAXINT)
-
-
-/* --- NM_SETTING_MACVLAN_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_macvlan_get_parent, NM_SETTING_MACVLAN_PARENT)
-DEFINE_GETTER (nmc_property_macvlan_get_promiscuous, NM_SETTING_MACVLAN_PROMISCUOUS)
-DEFINE_GETTER (nmc_property_macvlan_get_tap, NM_SETTING_MACVLAN_TAP)
-
-static char *
-nmc_property_macvlan_get_mode (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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 == NMC_PROPERTY_GET_PARSABLE)
-		str = g_strdup (tmp ? tmp : "");
-	else
-		str = g_strdup_printf ("%d (%s)", mode, tmp ? tmp : "");
-	g_free (tmp);
-
-	return str;
-}
-
-static gboolean
-nmc_property_macvlan_set_mode (NMSetting *setting, const char *prop,
-                               const char *val, GError **error)
-{
-	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 (val, 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 (), val,
-		                              (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]"),
-				             val, options_str);
-				return FALSE;
-			}
-		}
-
-	g_object_set (setting, prop, (guint) mode, NULL);
-	return TRUE;
-}
-
-DEFINE_ALLOWED_FOR_ENUMS (nmc_property_macvlan_allowed_mode,
-                          nm_setting_macvlan_mode_get_type,
-                          NM_SETTING_MACVLAN_MODE_UNKNOWN + 1, G_MAXINT)
-
-
-/* --- NM_SETTING_OLPC_MESH_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_olpc_get_channel, NM_SETTING_OLPC_MESH_CHANNEL)
-DEFINE_GETTER (nmc_property_olpc_get_anycast_address, NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS)
-
-static char *
-nmc_property_olpc_get_ssid (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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
-nmc_property_olpc_set_channel (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	unsigned long chan_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_uint (val, TRUE, 1, 13, &chan_int)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid channel; use <1-13>"), val);
-		return FALSE;
-	}
-	g_object_set (setting, prop, chan_int, NULL);
-	return TRUE;
-}
-
-
-/* --- NM_SETTING_PPP_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_ppp_get_noauth, NM_SETTING_PPP_NOAUTH)
-DEFINE_GETTER (nmc_property_ppp_get_refuse_eap, NM_SETTING_PPP_REFUSE_EAP)
-DEFINE_GETTER (nmc_property_ppp_get_refuse_pap, NM_SETTING_PPP_REFUSE_PAP)
-DEFINE_GETTER (nmc_property_ppp_get_refuse_chap, NM_SETTING_PPP_REFUSE_CHAP)
-DEFINE_GETTER (nmc_property_ppp_get_refuse_mschap, NM_SETTING_PPP_REFUSE_MSCHAP)
-DEFINE_GETTER (nmc_property_ppp_get_refuse_mschapv2, NM_SETTING_PPP_REFUSE_MSCHAPV2)
-DEFINE_GETTER (nmc_property_ppp_get_nobsdcomp, NM_SETTING_PPP_NOBSDCOMP)
-DEFINE_GETTER (nmc_property_ppp_get_nodeflate, NM_SETTING_PPP_NODEFLATE)
-DEFINE_GETTER (nmc_property_ppp_get_no_vj_comp, NM_SETTING_PPP_NO_VJ_COMP)
-DEFINE_GETTER (nmc_property_ppp_get_require_mppe, NM_SETTING_PPP_REQUIRE_MPPE)
-DEFINE_GETTER (nmc_property_ppp_get_require_mppe_128, NM_SETTING_PPP_REQUIRE_MPPE_128)
-DEFINE_GETTER (nmc_property_ppp_get_mppe_stateful, NM_SETTING_PPP_MPPE_STATEFUL)
-DEFINE_GETTER (nmc_property_ppp_get_crtscts, NM_SETTING_PPP_CRTSCTS)
-DEFINE_GETTER (nmc_property_ppp_get_baud, NM_SETTING_PPP_BAUD)
-DEFINE_GETTER (nmc_property_ppp_get_mru, NM_SETTING_PPP_MRU)
-DEFINE_GETTER (nmc_property_ppp_get_mtu, NM_SETTING_PPP_MTU)
-DEFINE_GETTER (nmc_property_ppp_get_lcp_echo_failure, NM_SETTING_PPP_LCP_ECHO_FAILURE)
-DEFINE_GETTER (nmc_property_ppp_get_lcp_echo_interval, NM_SETTING_PPP_LCP_ECHO_INTERVAL)
-
-
-/* --- NM_SETTING_PPPOE_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_pppoe_get_service, NM_SETTING_PPPOE_SERVICE)
-DEFINE_GETTER (nmc_property_pppoe_get_username, NM_SETTING_PPPOE_USERNAME)
-DEFINE_GETTER (nmc_property_pppoe_get_password, NM_SETTING_PPPOE_PASSWORD)
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_pppoe_get_password_flags, NM_SETTING_PPPOE_PASSWORD_FLAGS)
-
-
-/* --- NM_SETTING_PROXY_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_proxy_get_browser_only, NM_SETTING_PROXY_BROWSER_ONLY)
-DEFINE_GETTER (nmc_property_proxy_get_pac_url, NM_SETTING_PROXY_PAC_URL)
-DEFINE_GETTER (nmc_property_proxy_get_pac_script, NM_SETTING_PROXY_PAC_SCRIPT)
-
-static char *
-nmc_property_proxy_get_method (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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
-nmc_property_proxy_set_method (NMSetting *setting, const char *prop,
-                               const char *val, GError **error)
-{
-	int method;
-	gboolean ret;
-
-	ret = nm_utils_enum_from_str (nm_setting_proxy_method_get_type(), val,
-	                              &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"),
-		             val, values_str);
-
-		return FALSE;
-	}
-
-	g_object_set (setting, prop, method, NULL);
-	return TRUE;
-}
-
-DEFINE_ALLOWED_FOR_ENUMS (nmc_property_proxy_allowed_method,
-                          nm_setting_proxy_method_get_type,
-                          NM_SETTING_PROXY_METHOD_NONE, G_MAXINT)
-
-static gboolean
-nmc_property_proxy_set_pac_script (NMSetting *setting, const char *prop,
-                                   const char *val, GError **error)
-{
-	char *script = NULL;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_proxy_check_script (val, &script, error)) {
-		return FALSE;
-	}
-	g_object_set (setting, prop, script, NULL);
-	g_free (script);
-	return TRUE;
-}
-
-
-/* --- NM_SETTING_SERIAL_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_serial_get_baud, NM_SETTING_SERIAL_BAUD)
-DEFINE_GETTER (nmc_property_serial_get_bits, NM_SETTING_SERIAL_BITS)
-DEFINE_GETTER (nmc_property_serial_get_stopbits, NM_SETTING_SERIAL_STOPBITS)
-DEFINE_GETTER (nmc_property_serial_get_send_delay, NM_SETTING_SERIAL_SEND_DELAY)
-
-static char *
-nmc_property_serial_get_parity (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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
-nmc_property_serial_set_parity (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	NMSettingSerialParity parity;
-
-	if (val[0] == 'E' || val[0] == 'e')
-		parity = NM_SETTING_SERIAL_PARITY_EVEN;
-	else if (val[0] == 'O' || val[0] == 'o')
-		parity = NM_SETTING_SERIAL_PARITY_ODD;
-	else if (val[0] == 'N' || val[0] == 'n')
-		parity = NM_SETTING_SERIAL_PARITY_NONE;
-	else {
-		g_set_error (error, 1, 0, _("'%s' is not valid; use [e, o, n]"), val);
-		return FALSE;
-	}
-
-	g_object_set (setting, prop, parity, NULL);
-	return TRUE;
-}
-
-
-/* --- NM_SETTING_TEAM_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_team_get_config, NM_SETTING_TEAM_CONFIG)
-
-static gboolean
-nmc_property_team_set_config (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	char *json = NULL;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_team_check_config (val, &json, error)) {
-		return FALSE;
-	}
-	g_object_set (setting, prop, json, NULL);
-	g_free (json);
-	return TRUE;
-}
-
-static const char *
-nmc_property_team_describe_config (NMSetting *setting, const char *prop)
-{
-	return _("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");
-}
-
-
-/* --- NM_SETTING_TEAM_PORT_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_team_port_get_config, NM_SETTING_TEAM_PORT_CONFIG)
-
-
-/* --- NM_SETTING_TUN_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_tun_get_owner, NM_SETTING_TUN_OWNER);
-DEFINE_GETTER (nmc_property_tun_get_group, NM_SETTING_TUN_GROUP);
-DEFINE_GETTER (nmc_property_tun_get_pi, NM_SETTING_TUN_PI);
-DEFINE_GETTER (nmc_property_tun_get_vnet_hdr, NM_SETTING_TUN_VNET_HDR);
-DEFINE_GETTER (nmc_property_tun_get_multi_queue, NM_SETTING_TUN_MULTI_QUEUE);
-
-static char *
-nmc_property_tun_get_mode (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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 == NMC_PROPERTY_GET_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
-nmc_property_tun_set_mode (NMSetting *setting, const char *prop,
-                           const char *val, GError **error)
-{
-	NMSettingTunMode mode;
-	gboolean ret;
-	long int t;
-
-	if (nmc_string_to_int_base (val, 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 (), val,
-		                              (int *) &mode, NULL);
-
-		if (!ret) {
-			g_set_error (error, 1, 0, _("invalid option '%s', use '%s' or '%s'"),
-			             val, "tun", "tap");
-			return FALSE;
-		}
-	}
-
-	g_object_set (setting, prop, (guint) mode, NULL);
-	return TRUE;
-}
-
-static const char *tun_valid_modes[] = { "tun", "tap", "unknown", NULL };
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_tun_allowed_mode, tun_valid_modes)
-
-
-/* --- NM_SETTING_VLAN_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_vlan_get_parent, NM_SETTING_VLAN_PARENT)
-DEFINE_GETTER (nmc_property_vlan_get_id, NM_SETTING_VLAN_ID)
-
-static char *
-nmc_property_vlan_get_flags (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting);
-	return vlan_flags_to_string (nm_setting_vlan_get_flags (s_vlan), get_type);
-}
-
-static char *
-nmc_property_vlan_get_ingress_priority_map (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting);
-	return vlan_priorities_to_string (s_vlan, NM_VLAN_INGRESS_MAP);
-}
-
-static char *
-nmc_property_vlan_get_egress_priority_map (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting);
-	return vlan_priorities_to_string (s_vlan, NM_VLAN_EGRESS_MAP);
-}
-
-static gboolean
-nmc_property_vlan_set_prio_map (NMSetting *setting,
-                                const char *prop,
-                                const char *val,
-                                NMVlanPriorityMap map_type,
-                                GError **error)
-{
-	char **prio_map, **p;
-
-	prio_map = nmc_vlan_parse_priority_maps (val, 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
-nmc_property_vlan_remove_prio_map (NMSetting *setting,
-                                   const char *prop,
-                                   guint32 idx,
-                                   NMVlanPriorityMap map_type,
-                                   GError **error)
-{
-	guint32 num;
-
-	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
-nmc_property_vlan_set_ingress_priority_map (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return nmc_property_vlan_set_prio_map (setting, prop, val, NM_VLAN_INGRESS_MAP, error);
-}
-
-static gboolean
-nmc_property_vlan_set_egress_priority_map (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return nmc_property_vlan_set_prio_map (setting, prop, val, NM_VLAN_EGRESS_MAP, error);
-}
-
-static gboolean
-nmc_property_vlan_remove_priority_map (NMSetting *setting,
-                                       const char *prop,
-                                       const char *value,
-                                       guint32 idx,
-                                       NMVlanPriorityMap map,
-                                       GError **error)
-{
-	/* If value != NULL, remove by value */
-	if (value) {
-		gboolean ret;
-		char **prio_map;
-		char *val = g_strdup (value);
-
-		prio_map = nmc_vlan_parse_priority_maps (val, map, 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,
-		                                                    prio_map[0]);
-
-		if (!ret)
-			g_set_error (error, 1, 0, _("the property doesn't contain mapping '%s'"), prio_map[0]);
-		g_free (val);
-		g_strfreev (prio_map);
-		return ret;
-	}
-
-	/* Else remove by index */
-	return nmc_property_vlan_remove_prio_map (setting, prop, idx, map, error);
-}
-
-static gboolean
-nmc_property_vlan_remove_ingress_priority_map (NMSetting *setting,
-                                               const char *prop,
-                                               const char *value,
-                                               guint32 idx,
-                                               GError **error)
-{
-	return nmc_property_vlan_remove_priority_map (setting,
-                                                      prop,
-                                                      value,
-                                                      idx,
-                                                      NM_VLAN_INGRESS_MAP,
-                                                      error);
-}
-
-static gboolean
-nmc_property_vlan_remove_egress_priority_map (NMSetting *setting,
-                                              const char *prop,
-                                              const char *value,
-                                              guint32 idx,
-                                              GError **error)
-{
-	return nmc_property_vlan_remove_priority_map (setting,
-                                                      prop,
-                                                      value,
-                                                      idx,
-                                                      NM_VLAN_EGRESS_MAP,
-                                                      error);
-}
-
-
-/* --- NM_SETTING_VPN_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_vpn_get_service_type, NM_SETTING_VPN_SERVICE_TYPE)
-DEFINE_GETTER (nmc_property_vpn_get_user_name, NM_SETTING_VPN_USER_NAME)
-
-static char *
-nmc_property_vpn_get_data (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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 *
-nmc_property_vpn_get_secrets (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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);
-}
-
-DEFINE_GETTER (nmc_property_vpn_get_persistent, NM_SETTING_VPN_PERSISTENT)
-DEFINE_GETTER (nmc_property_vpn_get_timeout, NM_SETTING_VPN_TIMEOUT)
-
-/* Validate value of vpn 'data' and 'secret' options */
-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;
-}
-
-/* 'data' */
-DEFINE_SETTER_OPTIONS (nmc_property_vpn_set_data,
-                       NM_SETTING_VPN,
-                       NMSettingVpn,
-                       nm_setting_vpn_add_data_item,
-                       NULL,
-                       _validate_vpn_hash_value)
-DEFINE_REMOVER_OPTION (nmc_property_vpn_remove_option_data,
-                       NM_SETTING_VPN,
-                       nm_setting_vpn_remove_data_item)
-
-/* 'secrets' */
-DEFINE_SETTER_OPTIONS (nmc_property_vpn_set_secrets,
-                       NM_SETTING_VPN,
-                       NMSettingVpn,
-                       nm_setting_vpn_add_secret,
-                       NULL,
-                       _validate_vpn_hash_value)
-DEFINE_REMOVER_OPTION (nmc_property_vpn_remove_option_secret,
-                       NM_SETTING_VPN,
-                       nm_setting_vpn_remove_secret)
-
-
-/* --- NM_SETTING_VXLAN_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_vxlan_get_parent, NM_SETTING_VXLAN_PARENT)
-DEFINE_GETTER (nmc_property_vxlan_get_id, NM_SETTING_VXLAN_ID)
-DEFINE_GETTER (nmc_property_vxlan_get_local, NM_SETTING_VXLAN_LOCAL)
-DEFINE_GETTER (nmc_property_vxlan_get_remote, NM_SETTING_VXLAN_REMOTE)
-DEFINE_GETTER (nmc_property_vxlan_get_source_port_min, NM_SETTING_VXLAN_SOURCE_PORT_MIN)
-DEFINE_GETTER (nmc_property_vxlan_get_source_port_max, NM_SETTING_VXLAN_SOURCE_PORT_MAX)
-DEFINE_GETTER (nmc_property_vxlan_get_destination_port, NM_SETTING_VXLAN_DESTINATION_PORT)
-DEFINE_GETTER (nmc_property_vxlan_get_tos, NM_SETTING_VXLAN_TOS)
-DEFINE_GETTER (nmc_property_vxlan_get_ttl, NM_SETTING_VXLAN_TTL)
-DEFINE_GETTER (nmc_property_vxlan_get_ageing, NM_SETTING_VXLAN_AGEING)
-DEFINE_GETTER (nmc_property_vxlan_get_limit, NM_SETTING_VXLAN_LIMIT)
-DEFINE_GETTER (nmc_property_vxlan_get_learning, NM_SETTING_VXLAN_LEARNING)
-DEFINE_GETTER (nmc_property_vxlan_get_proxy, NM_SETTING_VXLAN_PROXY)
-DEFINE_GETTER (nmc_property_vxlan_get_rsc, NM_SETTING_VXLAN_RSC)
-DEFINE_GETTER (nmc_property_vxlan_get_l2_miss, NM_SETTING_VXLAN_L2_MISS)
-DEFINE_GETTER (nmc_property_vxlan_get_l3_miss, NM_SETTING_VXLAN_L3_MISS)
-
-
-/* --- NM_SETTING_WIMAX_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_wimax_get_network_name, NM_SETTING_WIMAX_NETWORK_NAME)
-DEFINE_GETTER (nmc_property_wimax_get_mac_address, NM_SETTING_WIMAX_MAC_ADDRESS)
-
-
-/* --- NM_SETTING_WIRED_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_wired_get_port, NM_SETTING_WIRED_PORT)
-DEFINE_GETTER (nmc_property_wired_get_auto_negotiate, NM_SETTING_WIRED_AUTO_NEGOTIATE)
-DEFINE_GETTER (nmc_property_wired_get_mac_address, NM_SETTING_WIRED_MAC_ADDRESS)
-DEFINE_GETTER (nmc_property_wired_get_cloned_mac_address, NM_SETTING_WIRED_CLONED_MAC_ADDRESS)
-DEFINE_GETTER (nmc_property_wired_get_generate_mac_address_mask, NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK)
-DEFINE_GETTER (nmc_property_wired_get_mac_address_blacklist, NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST)
-DEFINE_GETTER (nmc_property_wired_get_s390_subchannels, NM_SETTING_WIRED_S390_SUBCHANNELS)
-DEFINE_GETTER (nmc_property_wired_get_s390_nettype, NM_SETTING_WIRED_S390_NETTYPE)
-DEFINE_GETTER (nmc_property_wired_get_s390_options, NM_SETTING_WIRED_S390_OPTIONS)
-DEFINE_GETTER (nmc_property_wired_get_wake_on_lan_password, NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD)
-
-static char *
-nmc_property_wired_get_speed (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	NMSettingWired *s_wired = NM_SETTING_WIRED (setting);
-	guint32 speed;
-
-	speed = nm_setting_wired_get_speed (s_wired);
-	return g_strdup_printf ("%d", speed);
-}
-
-static char *
-nmc_property_wired_get_duplex (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	NMSettingWired *s_wired = NM_SETTING_WIRED (setting);
-	const char *str;
-
-	str = nm_setting_wired_get_duplex (s_wired);
-	if (!str)
-		return NULL;
-	else
-		return g_strdup (str);
-
-}
-
-static char *
-nmc_property_wired_get_mtu (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	NMSettingWired *s_wired = NM_SETTING_WIRED (setting);
-	int mtu;
-
-	mtu = nm_setting_wired_get_mtu (s_wired);
-	if (mtu == 0)
-		return g_strdup (_("auto"));
-	else
-		return g_strdup_printf ("%d", mtu);
-}
-
-static char *
-nmc_property_wired_get_wake_on_lan (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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 == NMC_PROPERTY_GET_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
-nmc_property_wired_set_wake_on_lan (NMSetting *setting, const char *prop,
-                                    const char *val, GError **error)
-{
-	NMSettingWiredWakeOnLan wol;
-	gs_free char *err_token = NULL;
-	gboolean ret;
-	long int t;
-
-	if (nmc_string_to_int_base (val, 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 (), val,
-		                              (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, prop, (guint) wol, NULL);
-	return TRUE;
-}
-
-#if 0
--/*
-- * 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.
-- */
-/* 'port' */
-static const char *wired_valid_ports[] = { "tp", "aui", "bnc", "mii", NULL };
-
-static gboolean
-nmc_property_wired_set_port (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_set_string (setting, prop, val, wired_valid_ports, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_wired_allowed_port, wired_valid_ports)
-#endif
-
-/* 'duplex' */
-static const char *wired_valid_duplexes[] = { "half", "full", NULL };
-
-static gboolean
-nmc_property_wired_set_duplex (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_set_string (setting, prop, val, wired_valid_duplexes, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_wired_allowed_duplex, wired_valid_duplexes)
-
-
-/* 'mac-address-blacklist' */
-DEFINE_SETTER_MAC_BLACKLIST (nmc_property_wired_set_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 (nmc_property_wired_remove_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)
-
-/* 's390-subchannels' */
-static gboolean
-nmc_property_wired_set_s390_subchannels (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	char **strv = NULL;
-	int len;
-
-	strv = nmc_strsplit_set (val, " ,\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"),
-		             val);
-		g_strfreev (strv);
-		return FALSE;
-	}
-
-	g_object_set (setting, prop, strv, NULL);
-	g_strfreev (strv);
-	return TRUE;
-}
-
-static const char *
-nmc_property_wired_describe_s390_subchannels (NMSetting *setting, const char *prop)
-{
-	return _("Enter a list of subchannels (comma or space separated).\n\n"
-	         "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n");
-}
-
-/* 's390-nettype' */
-static const char *wired_valid_s390_nettypes[] = { "qeth", "lcs", "ctc", NULL };
-
-static gboolean
-nmc_property_wired_set_s390_nettype (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_set_string (setting, prop, val, wired_valid_s390_nettypes, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_wired_allowed_s390_nettype, wired_valid_s390_nettypes)
-
-/* 's390-options' */
-/* Validate value of 's390-options' */
-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 (nmc_property_wired_set_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 (nmc_property_wired_remove_option_s390_options,
-                       NM_SETTING_WIRED,
-                       nm_setting_wired_remove_s390_option)
-
-static const char **
-nmc_property_wired_allowed_s390_options (NMSetting *setting, const char *prop)
-{
-	return nm_setting_wired_get_valid_s390_options (NM_SETTING_WIRED (setting));
-}
-
-static const char *
-nmc_property_wired_describe_s390_options (NMSetting *setting, const char *prop)
-{
-	static char *desc = NULL;
-	const char **valid_options;
-	char *options_str;
-
-	if (G_UNLIKELY (desc == NULL)) {
-		valid_options = nm_setting_wired_get_valid_s390_options (NM_SETTING_WIRED (setting));
-		options_str = g_strjoinv (", ", (char **) valid_options);
-
-		desc = 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);
-		g_free (options_str);
-	}
-	return desc;
-}
-
-
-/* --- NM_SETTING_WIRELESS_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_wireless_get_mode, NM_SETTING_WIRELESS_MODE)
-DEFINE_GETTER (nmc_property_wireless_get_band, NM_SETTING_WIRELESS_BAND)
-DEFINE_GETTER (nmc_property_wireless_get_channel, NM_SETTING_WIRELESS_CHANNEL)
-DEFINE_GETTER (nmc_property_wireless_get_bssid, NM_SETTING_WIRELESS_BSSID)
-DEFINE_GETTER (nmc_property_wireless_get_rate, NM_SETTING_WIRELESS_RATE)
-DEFINE_GETTER (nmc_property_wireless_get_tx_power, NM_SETTING_WIRELESS_TX_POWER)
-DEFINE_GETTER (nmc_property_wireless_get_mac_address, NM_SETTING_WIRELESS_MAC_ADDRESS)
-DEFINE_GETTER (nmc_property_wireless_get_cloned_mac_address, NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS)
-DEFINE_GETTER (nmc_property_wireless_get_generate_mac_address_mask, NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK)
-DEFINE_GETTER (nmc_property_wireless_get_mac_address_blacklist, NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST)
-DEFINE_GETTER (nmc_property_wireless_get_seen_bssids, NM_SETTING_WIRELESS_SEEN_BSSIDS)
-DEFINE_GETTER (nmc_property_wireless_get_hidden, NM_SETTING_WIRELESS_HIDDEN)
-
-static char *
-nmc_property_wireless_get_ssid (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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 *
-nmc_property_wireless_get_mtu (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	NMSettingWireless *s_wireless = NM_SETTING_WIRELESS (setting);
-	int mtu;
-
-	mtu = nm_setting_wireless_get_mtu (s_wireless);
-	if (mtu == 0)
-		return g_strdup (_("auto"));
-	else
-		return g_strdup_printf ("%d", mtu);
-}
-
-static char *
-nmc_property_wireless_get_powersave (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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 == NMC_PROPERTY_GET_PARSABLE) {
-		ret = str;
-		str = NULL;
-		return ret;
-	} else
-		return g_strdup_printf ("%s (%u)", str, powersave);
-}
-
-static char *
-nmc_property_wireless_get_mac_address_randomization (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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"));
-}
-
-/* 'mode' */
-static const char *wifi_valid_modes[] = {
-	NM_SETTING_WIRELESS_MODE_INFRA,
-	NM_SETTING_WIRELESS_MODE_ADHOC,
-	NM_SETTING_WIRELESS_MODE_AP,
-	NULL
-};
-
-static gboolean
-nmc_property_wifi_set_mode (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_set_string (setting, prop, val, wifi_valid_modes, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_wifi_allowed_mode, wifi_valid_modes)
-
-/* 'band' */
-static const char *wifi_valid_bands[] = { "a", "bg", NULL };
-
-static gboolean
-nmc_property_wifi_set_band (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_set_string (setting, prop, val, wifi_valid_bands, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_wifi_allowed_band, wifi_valid_bands)
-
-/* 'channel' */
-static gboolean
-nmc_property_wifi_set_channel (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	unsigned long chan_int;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nmc_string_to_uint (val, FALSE, 0, 0, &chan_int)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid channel"), val);
-		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, prop, chan_int, NULL);
-	return TRUE;
-}
-
-/* 'mac-address-blacklist' */
-DEFINE_SETTER_MAC_BLACKLIST (nmc_property_wireless_set_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 (nmc_property_wireless_remove_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)
-
-/* 'powersave' */
-static gboolean
-nmc_property_wireless_set_powersave (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	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 (val, 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 (),
-		                              val,
-		                              (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]"), val, options_str);
-			return FALSE;
-		}
-	}
-
-	g_object_set (setting, prop, (guint) powersave, NULL);
-	return TRUE;
-}
-
-static gboolean
-nmc_property_wireless_set_mac_address_randomization (NMSetting *setting,
-                                                     const char *prop,
-                                                     const char *val,
-                                                     GError **error)
-{
-	NMSettingMacRandomization randomization;
-	gs_free char *err_token = NULL;
-	gboolean ret;
-	long int t;
-
-	if (nmc_string_to_int_base (val, 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 (),
-		                              val,
-		                              (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, prop, (guint) randomization, NULL);
-	return TRUE;
-}
-
-
-/* --- NM_SETTING_WIRELESS_SECURITY_SETTING_NAME property functions --- */
-DEFINE_GETTER (nmc_property_wifi_sec_get_key_mgmt, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT)
-DEFINE_GETTER (nmc_property_wifi_sec_get_wep_tx_keyidx, NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX)
-DEFINE_GETTER (nmc_property_wifi_sec_get_auth_alg, NM_SETTING_WIRELESS_SECURITY_AUTH_ALG)
-DEFINE_GETTER (nmc_property_wifi_sec_get_proto, NM_SETTING_WIRELESS_SECURITY_PROTO)
-DEFINE_GETTER (nmc_property_wifi_sec_get_pairwise, NM_SETTING_WIRELESS_SECURITY_PAIRWISE)
-DEFINE_GETTER (nmc_property_wifi_sec_get_group, NM_SETTING_WIRELESS_SECURITY_GROUP)
-DEFINE_GETTER (nmc_property_wifi_sec_get_leap_username, NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME)
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_wifi_sec_get_wep_key_flags, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS)
-DEFINE_GETTER (nmc_property_wifi_sec_get_psk, NM_SETTING_WIRELESS_SECURITY_PSK)
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_wifi_sec_get_psk_flags, NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS)
-DEFINE_GETTER (nmc_property_wifi_sec_get_leap_password, NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD)
-DEFINE_SECRET_FLAGS_GETTER (nmc_property_wifi_sec_get_leap_password_flags, NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS)
-
-static char *
-nmc_property_wifi_sec_get_wep_key0 (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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 *
-nmc_property_wifi_sec_get_wep_key1 (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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 *
-nmc_property_wifi_sec_get_wep_key2 (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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 *
-nmc_property_wifi_sec_get_wep_key3 (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	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 *
-nmc_property_wifi_sec_get_wep_key_type (NMSetting *setting, NmcPropertyGetType get_type)
-{
-	NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting);
-	return wep_key_type_to_string (nm_setting_wireless_security_get_wep_key_type (s_wireless_sec));
-}
-
-/* 'key-mgmt' */
-static const char *wifi_sec_valid_key_mgmts[] = { "none", "ieee8021x", "wpa-none", "wpa-psk", "wpa-eap", NULL };
-
-static gboolean
-nmc_property_wifi_sec_set_key_mgmt (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_set_string (setting, prop, val, wifi_sec_valid_key_mgmts, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_wifi_sec_allowed_key_mgmt, wifi_sec_valid_key_mgmts)
-
-/* 'auth-alg' */
-static const char *wifi_sec_valid_auth_algs[] = { "open", "shared", "leap", NULL };
-
-static gboolean
-nmc_property_wifi_sec_set_auth_alg (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_set_string (setting, prop, val, wifi_sec_valid_auth_algs, error);
-}
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_wifi_sec_allowed_auth_alg, wifi_sec_valid_auth_algs)
-
-/* 'proto' */
-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
-nmc_property_wifi_sec_set_proto (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_add_wifi_sec_proto (setting, prop, val, 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 (nmc_property_wifi_sec_remove_proto,
-                               NM_SETTING_WIRELESS_SECURITY,
-                               nm_setting_wireless_security_get_num_protos,
-                               nm_setting_wireless_security_remove_proto,
-                               _validate_and_remove_wifi_sec_proto)
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_wifi_sec_allowed_proto, wifi_sec_valid_protos)
-
-/* 'pairwise' */
-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
-nmc_property_wifi_sec_set_pairwise (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_add_wifi_sec_pairwise (setting, prop, val, 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 (nmc_property_wifi_sec_remove_pairwise,
-                               NM_SETTING_WIRELESS_SECURITY,
-                               nm_setting_wireless_security_get_num_pairwise,
-                               nm_setting_wireless_security_remove_pairwise,
-                               _validate_and_remove_wifi_sec_pairwise)
-
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_wifi_sec_allowed_pairwise, wifi_sec_valid_pairwises)
-
-/* 'group' */
-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
-nmc_property_wifi_sec_set_group (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	return check_and_add_wifi_sec_group (setting, prop, val, 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 (nmc_property_wifi_sec_remove_group,
-                               NM_SETTING_WIRELESS_SECURITY,
-                               nm_setting_wireless_security_get_num_groups,
-                               nm_setting_wireless_security_remove_group,
-                               _validate_and_remove_wifi_sec_group)
-DEFINE_ALLOWED_VAL_FUNC (nmc_property_wifi_sec_allowed_group, wifi_sec_valid_groups)
-
-/* 'wep-key' */
-static gboolean
-nmc_property_wifi_set_wep_key (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	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 (val, NM_WEP_KEY_TYPE_KEY))
-		guessed_type = NM_WEP_KEY_TYPE_KEY;
-	else if (nm_utils_wep_key_valid (val, 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"), val);
-		return FALSE;
-	}
-
-	if (type != NM_WEP_KEY_TYPE_UNKNOWN && type != guessed_type) {
-		if (nm_utils_wep_key_valid (val, 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."),
-			             val, 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 = prop[strlen (prop) - 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, prop, val, 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;
-}
-
-/* 'wep-key-type' */
-static gboolean
-nmc_property_wifi_set_wep_key_type (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	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 (val, TRUE, 0, 2, &type_int)) {
-		if (!(type_str = nmc_string_is_valid (val, valid_wep_types, NULL))) {
-			g_set_error (error, 1, 0, _("'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"), val);
-			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, prop, type, NULL);
-	return TRUE;
-}
-
-static const char *
-nmc_property_wifi_describe_wep_key_type (NMSetting *setting, const char *prop)
-{
-	static char *desc = NULL;
-
-	if (G_UNLIKELY (desc == NULL)) {
-		desc = g_strdup_printf (_("Enter the type of WEP keys. The accepted values are: "
-		                          "0 or unknown, 1 or key, and 2 or passphrase.\n"));
-	}
-	return desc;
-}
-
-/* 'psk' */
-static gboolean
-nmc_property_wifi_set_psk (NMSetting *setting, const char *prop, const char *val, GError **error)
-{
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-	if (!nm_utils_wpa_psk_valid (val)) {
-		g_set_error (error, 1, 0, _("'%s' is not a valid PSK"), val);
-		return FALSE;
-	}
-	g_object_set (setting, prop, val, 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);
-}
-
-/*----------------------------------------------------------------------------*/
-
-/* Main hash table storing function pointer for manipulating properties */
-static GHashTable *nmc_properties = NULL;
-typedef	char *        (*NmcPropertyGetFunc)      (NMSetting *, NmcPropertyGetType);
-typedef	gboolean      (*NmcPropertySetFunc)      (NMSetting *, const char *, const char *, GError **);
-typedef	gboolean      (*NmcPropertyRemoveFunc)   (NMSetting *, const char *, const char *, guint32, GError **);
-typedef	const char *  (*NmcPropertyDescribeFunc) (NMSetting *, const char *);
-typedef	const char ** (*NmcPropertyValuesFunc)   (NMSetting *, const char *);
+#include "nm-client-utils.h"
+#include "nm-vpn-helpers.h"
+#include "nm-meta-setting-access.h"
 
-typedef struct {
-	/* The order of the fields is important as they correspond
-	 * to the order as _nmc_add_prop_funcs() passes the arguments. */
-#define NmcPropertyFuncsFields \
-	NmcPropertyGetFunc get_func;           /* func getting property values */ \
-	NmcPropertySetFunc set_func;           /* func adding/setting property values */ \
-	NmcPropertyRemoveFunc remove_func;     /* func removing items from container options */ \
-	NmcPropertyDescribeFunc describe_func; /* func returning property description */ \
-	NmcPropertyValuesFunc values_func;     /* func returning allowed property values */ \
-	;
-	NmcPropertyFuncsFields
-} NmcPropertyFuncs;
+#include "utils.h"
+#include "common.h"
 
-NMSetting *
-nmc_setting_new_for_name (const char *name)
-{
-	GType stype;
-	NMSetting *setting = NULL;
-
-	if (name) {
-		stype = nm_setting_lookup_type (name);
-		if (stype != G_TYPE_INVALID) {
-			setting = g_object_new (stype, NULL);
-			g_warn_if_fail (NM_IS_SETTING (setting));
-		}
-	}
-	return setting;
-}
+/*****************************************************************************/
 
 static gboolean
 get_answer (const char *prop, const char *value)
@@ -6082,2326 +304,175 @@ nmc_setting_connection_connect_handlers (NMSettingConnection *setting, NMConnect
 	                  G_CALLBACK (connection_master_changed_cb), connection);
 }
 
-/*
- * Customize some properties of the setting so that the setting has sensible
- * values.
- */
-void
-nmc_setting_custom_init (NMSetting *setting)
-{
-	g_return_if_fail (NM_IS_SETTING (setting));
+/*****************************************************************************/
 
-	if (NM_IS_SETTING_VLAN (setting)) {
-		/* Set sensible initial VLAN values */
-		g_object_set (NM_SETTING_VLAN (setting),
-		              NM_SETTING_VLAN_ID, 1,
-		              NULL);
-	} else if (NM_IS_SETTING_INFINIBAND (setting)) {
-		/* Initialize 'transport-mode' so that 'infiniband' is valid */
-		g_object_set (NM_SETTING_INFINIBAND (setting),
-		              NM_SETTING_INFINIBAND_TRANSPORT_MODE, "datagram",
-		              NULL);
-	} else if (NM_IS_SETTING_CDMA (setting)) {
-		/* Initialize 'number' so that 'cdma' is valid */
-		g_object_set (NM_SETTING_CDMA (setting),
-		              NM_SETTING_CDMA_NUMBER, "#777",
-		              NULL);
-	} else if (NM_IS_SETTING_GSM (setting)) {
-		/* Initialize 'number' so that 'gsm' is valid */
-		g_object_set (NM_SETTING_GSM (setting),
-		              NM_SETTING_GSM_NUMBER, "*99#",
-		              NULL);
-	} else if (NM_IS_SETTING_OLPC_MESH (setting)) {
-		g_object_set (NM_SETTING_OLPC_MESH (setting),
-		              NM_SETTING_OLPC_MESH_CHANNEL, 1,
-		              NULL);
-	} else if (NM_IS_SETTING_WIRELESS (setting)) {
-		/* For Wi-Fi set mode to "infrastructure". Even though mode == NULL
-		 * is regarded as "infrastructure", explicit value makes no doubts.
-		 */
-		g_object_set (NM_SETTING_WIRELESS (setting),
-		              NM_SETTING_WIRELESS_MODE, NM_SETTING_WIRELESS_MODE_INFRA,
-		              NULL);
-	} else if (NM_IS_SETTING_ADSL (setting)) {
-		/* Initialize a protocol */
-		g_object_set (NM_SETTING_ADSL (setting),
-		              NM_SETTING_ADSL_PROTOCOL, NM_SETTING_ADSL_PROTOCOL_PPPOE,
-		              NULL);
-	} else if (NM_IS_SETTING_IP4_CONFIG (setting)) {
-		g_object_set (NM_SETTING_IP_CONFIG (setting),
-		              NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
-		              NULL);
-	} else if (NM_IS_SETTING_IP6_CONFIG (setting)) {
-		g_object_set (NM_SETTING_IP_CONFIG (setting),
-		              NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_AUTO,
-		              NULL);
-	} else if (NM_IS_SETTING_PROXY (setting)) {
-		g_object_set (NM_SETTING_PROXY (setting),
-		              NM_SETTING_PROXY_METHOD, (int) NM_SETTING_PROXY_METHOD_NONE,
-		              NULL);
-	} else if (NM_IS_SETTING_TUN (setting)) {
-		g_object_set (NM_SETTING_TUN (setting),
-		              NM_SETTING_TUN_MODE, NM_SETTING_TUN_MODE_TUN,
-		              NULL);
-	} else if (NM_IS_SETTING_BLUETOOTH (setting)) {
-		g_object_set (NM_SETTING_BLUETOOTH (setting),
-		              NM_SETTING_BLUETOOTH_TYPE, NM_SETTING_BLUETOOTH_TYPE_PANU,
-		              NULL);
-	}
-}
-
-/*----------------------------------------------------------------------------*/
-
-static inline void
-_nmc_add_prop_funcs (const char *key,
-                     const NmcPropertyFuncs *item_init)
-{
-	NmcPropertyFuncs *item;
-
-	item = g_malloc (sizeof (NmcPropertyFuncs));
-	*item = *item_init;
-	g_hash_table_insert (nmc_properties, (gpointer) key, item);
-}
-
-#define nmc_add_prop_funcs(key, ...) \
-	G_STMT_START { \
-		struct { \
-			NmcPropertyFuncsFields; \
-			/* The _dummy field is here so that the last argument can be always
-			 * NULL. That means every call to nmc_add_prop_funcs() below ends
-			 * with a separate line "NULL);". */ \
-			gpointer _dummy; \
-		} _item_init = { \
-			__VA_ARGS__ \
-		};\
-		\
-		nm_assert (_item_init._dummy == NULL); \
-		_nmc_add_prop_funcs ("" key, (NmcPropertyFuncs *) &_item_init); \
-	} G_STMT_END
-
-/* concatenate setting name and property name */
-#define GLUE(A,B) "" NM_SETTING_##A##_SETTING_NAME "" NM_SETTING_##A##_##B ""
-#define GLUE_IP(A,B) "" NM_SETTING_IP##A##_CONFIG_SETTING_NAME "" NM_SETTING_IP_CONFIG_##B ""
-
-void
-nmc_properties_init (void)
+static gboolean
+_set_fcn_precheck_connection_secondaries (const char *value,
+                                          char **value_coerced,
+                                          GError **error)
 {
-	if (G_LIKELY (nmc_properties))
-		return;
-
-	/* create properties hash table */
-	nmc_properties = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free);
-
-	/* Add editable properties for NM_SETTING_802_1X_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (802_1X, EAP),
-	                    nmc_property_802_1X_get_eap,
-	                    nmc_property_802_1X_set_eap,
-	                    nmc_property_802_1X_remove_eap,
-	                    NULL,
-	                    nmc_property_802_1X_allowed_eap,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, IDENTITY),
-	                    nmc_property_802_1X_get_identity,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, ANONYMOUS_IDENTITY),
-	                    nmc_property_802_1X_get_anonymous_identity,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PAC_FILE),
-	                    nmc_property_802_1X_get_pac_file,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, CA_CERT),
-	                    nmc_property_802_1X_get_ca_cert,
-	                    nmc_property_802_1X_set_ca_cert,
-	                    NULL,
-	                    nmc_property_802_1X_describe_ca_cert,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, CA_CERT_PASSWORD),
-	                    nmc_property_802_1X_get_ca_cert_password,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, CA_CERT_PASSWORD_FLAGS),
-	                    nmc_property_802_1X_get_ca_cert_password_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, CA_PATH),
-	                    nmc_property_802_1X_get_ca_path,
-                            nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, SUBJECT_MATCH),
-	                    nmc_property_802_1X_get_subject_match,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, ALTSUBJECT_MATCHES),
-	                    nmc_property_802_1X_get_altsubject_matches,
-	                    nmc_property_802_1X_set_altsubject_matches,
-	                    nmc_property_802_1X_remove_altsubject_matches,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, DOMAIN_SUFFIX_MATCH),
-	                    nmc_property_802_1X_get_domain_suffix_match,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, CLIENT_CERT),
-	                    nmc_property_802_1X_get_client_cert_full,
-	                    nmc_property_802_1X_set_client_cert,
-	                    NULL,
-	                    nmc_property_802_1X_describe_client_cert,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, CLIENT_CERT_PASSWORD),
-	                    nmc_property_802_1X_get_client_cert_password,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, CLIENT_CERT_PASSWORD_FLAGS),
-	                    nmc_property_802_1X_get_client_cert_password_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE1_PEAPVER),
-	                    nmc_property_802_1X_get_phase1_peapver,
-	                    nmc_property_802_1X_set_phase1_peapver,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_802_1X_allowed_phase1_peapver,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE1_PEAPLABEL),
-	                    nmc_property_802_1X_get_phase1_peaplabel,
-	                    nmc_property_802_1X_set_phase1_peaplabel,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_802_1X_allowed_phase1_peaplabel,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE1_FAST_PROVISIONING),
-	                    nmc_property_802_1X_get_phase1_fast_provisioning,
-	                    nmc_property_802_1X_set_phase1_fast_provisioning,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_802_1X_allowed_phase1_fast_provisioning,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE1_AUTH_FLAGS),
-	                    nmc_property_802_1X_get_phase1_auth_flags,
-	                    nmc_property_802_1X_set_phase1_auth_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE2_AUTH),
-	                    nmc_property_802_1X_get_phase2_auth,
-	                    nmc_property_802_1X_set_phase2_auth,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_802_1X_allowed_phase2_auth,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE2_AUTHEAP),
-	                    nmc_property_802_1X_get_phase2_autheap,
-	                    nmc_property_802_1X_set_phase2_autheap,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_802_1X_allowed_phase2_autheap,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CA_CERT),
-	                    nmc_property_802_1X_get_phase2_ca_cert,
-	                    nmc_property_802_1X_set_phase2_ca_cert,
-	                    NULL,
-	                    nmc_property_802_1X_describe_phase2_ca_cert,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CA_CERT_PASSWORD),
-	                    nmc_property_802_1X_get_phase2_ca_cert_password,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CA_CERT_PASSWORD_FLAGS),
-	                    nmc_property_802_1X_get_phase2_ca_cert_password_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CA_PATH),
-	                    nmc_property_802_1X_get_phase2_ca_path,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE2_SUBJECT_MATCH),
-	                    nmc_property_802_1X_get_phase2_subject_match,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE2_ALTSUBJECT_MATCHES),
-	                    nmc_property_802_1X_get_phase2_altsubject_matches,
-	                    nmc_property_802_1X_set_phase2_altsubject_matches,
-	                    nmc_property_802_1X_remove_phase2_altsubject_matches,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE2_DOMAIN_SUFFIX_MATCH),
-	                    nmc_property_802_1X_get_phase2_domain_suffix_match,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CLIENT_CERT),
-	                    nmc_property_802_1X_get_phase2_client_cert_full,
-	                    nmc_property_802_1X_set_phase2_client_cert,
-	                    NULL,
-	                    nmc_property_802_1X_describe_phase2_client_cert,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CLIENT_CERT_PASSWORD),
-	                    nmc_property_802_1X_get_phase2_client_cert_password,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CLIENT_CERT_PASSWORD_FLAGS),
-	                    nmc_property_802_1X_get_phase2_client_cert_password_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PASSWORD),
-	                    nmc_property_802_1X_get_password,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PASSWORD_FLAGS),
-	                    nmc_property_802_1X_get_password_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PASSWORD_RAW),
-	                    nmc_property_802_1X_get_password_raw,
-	                    nmc_property_802_1X_set_password_raw,
-	                    NULL,
-	                    nmc_property_802_1X_describe_password_raw,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PASSWORD_RAW_FLAGS),
-	                    nmc_property_802_1X_get_password_raw_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PRIVATE_KEY),
-	                    nmc_property_802_1X_get_private_key_full,
-	                    nmc_property_802_1X_set_private_key,
-	                    NULL,
-	                    nmc_property_802_1X_describe_private_key,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PRIVATE_KEY_PASSWORD),
-	                    nmc_property_802_1X_get_private_key_password,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PRIVATE_KEY_PASSWORD_FLAGS),
-	                    nmc_property_802_1X_get_private_key_password_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE2_PRIVATE_KEY),
-	                    nmc_property_802_1X_get_phase2_private_key_full,
-	                    nmc_property_802_1X_set_phase2_private_key,
-	                    NULL,
-	                    nmc_property_802_1X_describe_private_key,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE2_PRIVATE_KEY_PASSWORD),
-	                    nmc_property_802_1X_get_phase2_private_key_password,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PHASE2_PRIVATE_KEY_PASSWORD_FLAGS),
-	                    nmc_property_802_1X_get_phase2_private_key_password_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PIN),
-	                    nmc_property_802_1X_get_pin,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, PIN_FLAGS),
-	                    nmc_property_802_1X_get_pin_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, SYSTEM_CA_CERTS),
-	                    nmc_property_802_1X_get_system_ca_certs,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (802_1X, AUTH_TIMEOUT),
-	                    nmc_property_802_1X_get_auth_timeout,
-	                    nmc_property_set_int,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-
-	/* Add editable properties for NM_SETTING_ADSL_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (ADSL, USERNAME),
-	                    nmc_property_adsl_get_username,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (ADSL, PASSWORD),
-	                    nmc_property_adsl_get_password,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (ADSL, PASSWORD_FLAGS),
-	                    nmc_property_adsl_get_password_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (ADSL, PROTOCOL),
-	                    nmc_property_adsl_get_protocol,
-	                    nmc_property_adsl_set_protocol,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_adsl_allowed_protocol,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (ADSL, ENCAPSULATION),
-	                    nmc_property_adsl_get_encapsulation,
-	                    nmc_property_adsl_set_encapsulation,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_adsl_allowed_encapsulation,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (ADSL, VPI),
-	                    nmc_property_adsl_get_vpi,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (ADSL, VCI),
-	                    nmc_property_adsl_get_vci,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-
-	/* Add editable properties for NM_SETTING_BLUETOOTH_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (BLUETOOTH, BDADDR),
-	                    nmc_property_bluetooth_get_bdaddr,
-	                    nmc_property_set_mac,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (BLUETOOTH, TYPE),
-	                    nmc_property_bluetooth_get_type,
-	                    nmc_property_bluetooth_set_type,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-
-	/* Add editable properties for NM_SETTING_BOND_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (BOND, OPTIONS),
-	                    nmc_property_bond_get_options,
-	                    nmc_property_bond_set_options,
-	                    nmc_property_bond_remove_option_options,
-	                    nmc_property_bond_describe_options,
-	                    nmc_property_bond_allowed_options,
-	                    NULL);
-
-	/* Add editable properties for NM_SETTING_BRIDGE_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (BRIDGE, MAC_ADDRESS),
-	                    nmc_property_bridge_get_mac_address,
-	                    nmc_property_set_mac,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (BRIDGE, STP),
-	                    nmc_property_bridge_get_stp,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (BRIDGE, PRIORITY),
-	                    nmc_property_bridge_get_priority,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (BRIDGE, FORWARD_DELAY),
-	                    nmc_property_bridge_get_forward_delay,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (BRIDGE, HELLO_TIME),
-	                    nmc_property_bridge_get_hello_time,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (BRIDGE, MAX_AGE),
-	                    nmc_property_bridge_get_max_age,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (BRIDGE, AGEING_TIME),
-	                    nmc_property_bridge_get_ageing_time,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-
-	nmc_add_prop_funcs (GLUE (BRIDGE, MULTICAST_SNOOPING),
-	                    nmc_property_bridge_get_multicast_snooping,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-
-	/* Add editable properties for NM_SETTING_BRIDGE_PORT_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (BRIDGE_PORT, PRIORITY),
-	                    nmc_property_bridge_port_get_priority,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (BRIDGE_PORT, PATH_COST),
-	                    nmc_property_bridge_port_get_path_cost,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (BRIDGE_PORT, HAIRPIN_MODE),
-	                    nmc_property_bridge_port_get_hairpin_mode,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-
-	/* Add editable properties for NM_SETTING_CDMA_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (CDMA, NUMBER),
-	                    nmc_property_cdma_get_number,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CDMA, USERNAME),
-	                    nmc_property_cdma_get_username,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CDMA, PASSWORD),
-	                    nmc_property_cdma_get_password,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CDMA, PASSWORD_FLAGS),
-	                    nmc_property_cdma_get_password_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CDMA, MTU),
-	                    nmc_property_cdma_get_mtu,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-
-	/* Add editable properties for NM_SETTING_CONNECTION_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (CONNECTION, ID),
-	                    nmc_property_connection_get_id,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, UUID),
-	                    nmc_property_connection_get_uuid,
-	                    NULL, /* forbid setting/removing UUID */
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, STABLE_ID),
-	                    nmc_property_connection_get_stable_id,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, INTERFACE_NAME),
-	                    nmc_property_connection_get_interface_name,
-	                    nmc_property_set_ifname,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, TYPE),
-	                    nmc_property_connection_get_type,
-	                    nmc_property_connection_set_type,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, AUTOCONNECT),
-	                    nmc_property_connection_get_autoconnect,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, AUTOCONNECT_PRIORITY),
-	                    nmc_property_connection_get_autoconnect_priority,
-	                    nmc_property_set_int,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, AUTOCONNECT_RETRIES),
-	                    nmc_property_connection_get_autoconnect_retries,
-	                    nmc_property_set_int,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, TIMESTAMP),
-	                    nmc_property_connection_get_timestamp,
-	                    NULL, /* read-only */
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, READ_ONLY),
-	                    nmc_property_connection_get_read_only,
-	                    NULL, /* 'read-only' is read-only :-) */
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, PERMISSIONS),
-	                    nmc_property_connection_get_permissions,
-	                    nmc_property_connection_set_permissions,
-	                    nmc_property_connection_remove_permissions,
-	                    nmc_property_connection_describe_permissions,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, ZONE),
-	                    nmc_property_connection_get_zone,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, MASTER),
-	                    nmc_property_connection_get_master,
-	                    nmc_property_con_set_master,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, SLAVE_TYPE),
-	                    nmc_property_connection_get_slave_type,
-	                    nmc_property_con_set_slave_type,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_con_allowed_slave_type,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, AUTOCONNECT_SLAVES),
-	                    nmc_property_connection_get_autoconnect_slaves,
-	                    nmc_property_set_trilean,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, SECONDARIES),
-	                    nmc_property_connection_get_secondaries,
-	                    nmc_property_connection_set_secondaries,
-	                    nmc_property_connection_remove_secondaries,
-	                    nmc_property_connection_describe_secondaries,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, GATEWAY_PING_TIMEOUT),
-	                    nmc_property_connection_get_gateway_ping_timeout,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, METERED),
-	                    nmc_property_connection_get_metered,
-	                    nmc_property_connection_set_metered,
-	                    NULL,
-	                    nmc_property_connection_describe_metered,
-	                    nmc_property_connection_allowed_metered,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (CONNECTION, LLDP),
-	                    nmc_property_connection_get_lldp,
-	                    nmc_property_connection_set_lldp,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_connection_allowed_lldp,
-	                    NULL);
-
-	/* Add editable properties for NM_SETTING_DCB_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (DCB, APP_FCOE_FLAGS),
-	                    nmc_property_dcb_get_app_fcoe_flags,
-	                    nmc_property_dcb_set_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (DCB, APP_FCOE_MODE),
-	                    nmc_property_dcb_get_app_fcoe_mode,
-	                    nmc_property_dcb_set_app_fcoe_mode,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_dcb_allowed_app_fcoe_modes,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (DCB, APP_FCOE_PRIORITY),
-	                    nmc_property_dcb_get_app_fcoe_priority,
-	                    nmc_property_dcb_set_priority,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (DCB, APP_ISCSI_FLAGS),
-	                    nmc_property_dcb_get_app_iscsi_flags,
-	                    nmc_property_dcb_set_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (DCB, APP_ISCSI_PRIORITY),
-	                    nmc_property_dcb_get_app_iscsi_priority,
-	                    nmc_property_dcb_set_priority,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (DCB, APP_FIP_FLAGS),
-	                    nmc_property_dcb_get_app_fip_flags,
-	                    nmc_property_dcb_set_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (DCB, APP_FIP_PRIORITY),
-	                    nmc_property_dcb_get_app_fip_priority,
-	                    nmc_property_dcb_set_priority,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (DCB, PRIORITY_FLOW_CONTROL_FLAGS),
-	                    nmc_property_dcb_get_pfc_flags,
-	                    nmc_property_dcb_set_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (DCB, PRIORITY_FLOW_CONTROL),
-	                    nmc_property_dcb_get_pfc,
-	                    nmc_property_dcb_set_pfc,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (DCB, PRIORITY_GROUP_FLAGS),
-	                    nmc_property_dcb_get_pg_flags,
-	                    nmc_property_dcb_set_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (DCB, PRIORITY_GROUP_ID),
-	                    nmc_property_dcb_get_pg_group_id,
-	                    nmc_property_dcb_set_pg_group_id,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (DCB, PRIORITY_GROUP_BANDWIDTH),
-	                    nmc_property_dcb_get_pg_group_bandwidth,
-	                    nmc_property_dcb_set_pg_group_bandwidth,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (DCB, PRIORITY_BANDWIDTH),
-	                    nmc_property_dcb_get_pg_bandwidth,
-	                    nmc_property_dcb_set_pg_bandwidth,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (DCB, PRIORITY_STRICT_BANDWIDTH),
-	                    nmc_property_dcb_get_pg_strict,
-	                    nmc_property_dcb_set_pg_strict,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (DCB, PRIORITY_TRAFFIC_CLASS),
-	                    nmc_property_dcb_get_pg_traffic_class,
-	                    nmc_property_dcb_set_pg_traffic_class,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-
-	/* Add editable properties for NM_SETTING_GSM_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (GSM, NUMBER),
-	                    nmc_property_gsm_get_number,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (GSM, USERNAME),
-	                    nmc_property_gsm_get_username,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (GSM, PASSWORD),
-	                    nmc_property_gsm_get_password,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (GSM, PASSWORD_FLAGS),
-	                    nmc_property_gsm_get_password_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (GSM, APN),
-	                    nmc_property_gsm_get_apn,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (GSM, NETWORK_ID),
-	                    nmc_property_gsm_get_network_id,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (GSM, PIN),
-	                    nmc_property_gsm_get_pin,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (GSM, PIN_FLAGS),
-	                    nmc_property_gsm_get_pin_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (GSM, HOME_ONLY),
-	                    nmc_property_gsm_get_home_only,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (GSM, DEVICE_ID),
-	                    nmc_property_gsm_get_device_id,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (GSM, SIM_ID),
-	                    nmc_property_gsm_get_sim_id,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (GSM, SIM_OPERATOR_ID),
-	                    nmc_property_gsm_get_sim_operator_id,
-	                    nmc_property_gsm_set_sim_operator_id,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (GSM, MTU),
-	                    nmc_property_gsm_get_mtu,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-
-	/* Add editable properties for NM_SETTING_INFINIBAND_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (INFINIBAND, MAC_ADDRESS),
-	                    nmc_property_ib_get_mac_address,
-	                    nmc_property_ib_set_mac,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (INFINIBAND, MTU),
-	                    nmc_property_ib_get_mtu,
-	                    nmc_property_set_mtu,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (INFINIBAND, TRANSPORT_MODE),
-	                    nmc_property_ib_get_transport_mode,
-	                    nmc_property_ib_set_transport_mode,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_ib_allowed_transport_mode,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (INFINIBAND, P_KEY),
-	                    nmc_property_ib_get_p_key,
-	                    nmc_property_ib_set_p_key,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (INFINIBAND, PARENT),
-	                    nmc_property_ib_get_parent,
-	                    nmc_property_set_ifname,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-
-	/* Add editable properties for NM_SETTING_IP4_CONFIG_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE_IP (4, METHOD),
-	                    nmc_property_ipv4_get_method,
-	                    nmc_property_ipv4_set_method,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_ipv4_allowed_method,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (4, DNS),
-	                    nmc_property_ipv4_get_dns,
-	                    nmc_property_ipv4_set_dns,
-	                    nmc_property_ipv4_remove_dns,
-	                    nmc_property_ipv4_describe_dns,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (4, DNS_SEARCH),
-	                    nmc_property_ipv4_get_dns_search,
-	                    nmc_property_ipv4_set_dns_search,
-	                    nmc_property_ipv4_remove_dns_search,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (4, DNS_OPTIONS),
-	                    nmc_property_ipv4_get_dns_options,
-	                    nmc_property_ipv4_set_dns_options,
-	                    nmc_property_ipv4_remove_dns_option,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (4, DNS_PRIORITY),
-	                    nmc_property_ipv4_get_dns_priority,
-	                    nmc_property_set_int,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (4, ADDRESSES),
-	                    nmc_property_ip_get_addresses,
-	                    nmc_property_ipv4_set_addresses,
-	                    nmc_property_ipv4_remove_addresses,
-	                    nmc_property_ipv4_describe_addresses,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (4, GATEWAY),
-	                    nmc_property_ipv4_get_gateway,
-	                    nmc_property_ipv4_set_gateway,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (4, ROUTES),
-	                    nmc_property_ipv4_get_routes,
-	                    nmc_property_ipv4_set_routes,
-	                    nmc_property_ipv4_remove_routes,
-	                    nmc_property_ipv4_describe_routes,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (4, ROUTE_METRIC),
-	                    nmc_property_ipv4_get_route_metric,
-	                    nmc_property_set_int64,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (4, IGNORE_AUTO_ROUTES),
-	                    nmc_property_ipv4_get_ignore_auto_routes,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (4, IGNORE_AUTO_DNS),
-	                    nmc_property_ipv4_get_ignore_auto_dns,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (IP4_CONFIG, DHCP_CLIENT_ID),
-	                    nmc_property_ipv4_get_dhcp_client_id,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (4, DHCP_TIMEOUT),
-	                    nmc_property_ipv4_get_dhcp_timeout,
-	                    nmc_property_set_int,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (4, DHCP_SEND_HOSTNAME),
-	                    nmc_property_ipv4_get_dhcp_send_hostname,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (4, DHCP_HOSTNAME),
-	                    nmc_property_ipv4_get_dhcp_hostname,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (IP4_CONFIG, DHCP_FQDN),
-	                    nmc_property_ipv4_get_dhcp_fqdn,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (4, NEVER_DEFAULT),
-	                    nmc_property_ipv4_get_never_default,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (4, MAY_FAIL),
-	                    nmc_property_ipv4_get_may_fail,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (4, DAD_TIMEOUT),
-	                    nmc_property_ipv4_get_dad_timeout,
-	                    nmc_property_set_int,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
+	const GPtrArray *connections;
+	NMConnection *con;
+	gs_strfreev char **strv = NULL;
+	char **iter;
+	gboolean modified;
 
-	/* Add editable properties for NM_SETTING_IP6_CONFIG_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE_IP (6, METHOD),
-	                    nmc_property_ipv6_get_method,
-	                    nmc_property_ipv6_set_method,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_ipv6_allowed_method,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (6, DNS),
-	                    nmc_property_ipv6_get_dns,
-	                    nmc_property_ipv6_set_dns,
-	                    nmc_property_ipv6_remove_dns,
-	                    nmc_property_ipv6_describe_dns,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (6, DNS_SEARCH),
-	                    nmc_property_ipv6_get_dns_search,
-	                    nmc_property_ipv6_set_dns_search,
-	                    nmc_property_ipv6_remove_dns_search,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (6, DNS_OPTIONS),
-	                    nmc_property_ipv6_get_dns_options,
-	                    nmc_property_ipv6_set_dns_options,
-	                    nmc_property_ipv6_remove_dns_option,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (6, DNS_PRIORITY),
-	                    nmc_property_ipv6_get_dns_priority,
-	                    nmc_property_set_int,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (6, ADDRESSES),
-	                    nmc_property_ip_get_addresses,
-	                    nmc_property_ipv6_set_addresses,
-	                    nmc_property_ipv6_remove_addresses,
-	                    nmc_property_ipv6_describe_addresses,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (6, GATEWAY),
-	                    nmc_property_ipv6_get_gateway,
-	                    nmc_property_ipv6_set_gateway,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (6, ROUTES),
-	                    nmc_property_ipv6_get_routes,
-	                    nmc_property_ipv6_set_routes,
-	                    nmc_property_ipv6_remove_routes,
-	                    nmc_property_ipv6_describe_routes,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (6, ROUTE_METRIC),
-	                    nmc_property_ipv6_get_route_metric,
-	                    nmc_property_set_int64,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (6, IGNORE_AUTO_ROUTES),
-	                    nmc_property_ipv6_get_ignore_auto_routes,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (6, IGNORE_AUTO_DNS),
-	                    nmc_property_ipv6_get_ignore_auto_dns,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (6, NEVER_DEFAULT),
-	                    nmc_property_ipv6_get_never_default,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (6, MAY_FAIL),
-	                    nmc_property_ipv6_get_may_fail,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (IP6_CONFIG, IP6_PRIVACY),
-	                    nmc_property_ipv6_get_ip6_privacy,
-	                    nmc_property_ipv6_set_ip6_privacy,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (IP6_CONFIG, ADDR_GEN_MODE),
-	                    nmc_property_ipv6_get_addr_gen_mode,
-	                    nmc_property_ipv6_set_addr_gen_mode,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_ipv6_allowed_addr_gen_mode,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (6, DHCP_SEND_HOSTNAME),
-	                    nmc_property_ipv6_get_dhcp_send_hostname,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE_IP (6, DHCP_HOSTNAME),
-	                    nmc_property_ipv6_get_dhcp_hostname,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (IP6_CONFIG, TOKEN),
-	                    nmc_property_ipv6_get_token,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
+	strv = nmc_strsplit_set (value, " \t,", 0);
+	if (!strv)
+		return TRUE;
 
-	/* Add editable properties for NM_SETTING_OLPC_MESH_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (OLPC_MESH, SSID),
-	                    nmc_property_olpc_get_ssid,
-	                    nmc_property_set_ssid,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (OLPC_MESH, CHANNEL),
-	                    nmc_property_olpc_get_channel,
-	                    nmc_property_olpc_set_channel,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (OLPC_MESH, DHCP_ANYCAST_ADDRESS),
-	                    nmc_property_olpc_get_anycast_address,
-	                    nmc_property_set_mac,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
+	connections = nm_client_get_connections (nm_cli.client);
 
-	/* Add editable properties for NM_SETTING_PPP_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (PPP, NOAUTH),
-	                    nmc_property_ppp_get_noauth,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPP, REFUSE_EAP),
-	                    nmc_property_ppp_get_refuse_eap,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPP, REFUSE_PAP),
-	                    nmc_property_ppp_get_refuse_pap,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPP, REFUSE_CHAP),
-	                    nmc_property_ppp_get_refuse_chap,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPP, REFUSE_MSCHAP),
-	                    nmc_property_ppp_get_refuse_mschap,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPP, REFUSE_MSCHAPV2),
-	                    nmc_property_ppp_get_refuse_mschapv2,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPP, NOBSDCOMP),
-	                    nmc_property_ppp_get_nobsdcomp,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPP, NODEFLATE),
-	                    nmc_property_ppp_get_nodeflate,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPP, NO_VJ_COMP),
-	                    nmc_property_ppp_get_no_vj_comp,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPP, REQUIRE_MPPE),
-	                    nmc_property_ppp_get_require_mppe,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPP, REQUIRE_MPPE_128),
-	                    nmc_property_ppp_get_require_mppe_128,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPP, MPPE_STATEFUL),
-	                    nmc_property_ppp_get_mppe_stateful,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPP, CRTSCTS),
-	                    nmc_property_ppp_get_crtscts,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPP, BAUD),
-	                    nmc_property_ppp_get_baud,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPP, MRU),
-	                    nmc_property_ppp_get_mru,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPP, MTU),
-	                    nmc_property_ppp_get_mtu,
-	                    nmc_property_set_mtu,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPP, LCP_ECHO_FAILURE),
-	                    nmc_property_ppp_get_lcp_echo_failure,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPP, LCP_ECHO_INTERVAL),
-	                    nmc_property_ppp_get_lcp_echo_interval,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
+	for (iter = strv; *iter; iter++) {
+		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);
+					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);
+				return FALSE;
+			}
 
-	/* Add editable properties for NM_SETTING_PPPOE_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (PPPOE, SERVICE),
-	                    nmc_property_pppoe_get_service,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPPOE, USERNAME),
-	                    nmc_property_pppoe_get_username,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPPOE, PASSWORD),
-	                    nmc_property_pppoe_get_password,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PPPOE, PASSWORD_FLAGS),
-	                    nmc_property_pppoe_get_password_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
+			/* 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);
+				return FALSE;
+			}
 
-	/* Add editable properties for NM_SETTING_SERIAL_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (SERIAL, BAUD),
-	                    nmc_property_serial_get_baud,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (SERIAL, BITS),
-	                    nmc_property_serial_get_bits,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (SERIAL, PARITY),
-	                    nmc_property_serial_get_parity,
-	                    nmc_property_serial_set_parity,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (SERIAL, STOPBITS),
-	                    nmc_property_serial_get_stopbits,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (SERIAL, SEND_DELAY),
-	                    nmc_property_serial_get_send_delay,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
+			/* translate id to uuid */
+			g_free (*iter);
+			*iter = g_strdup (nm_connection_get_uuid (con));
+			modified = TRUE;
+		}
+	}
 
-	/* Add editable properties for NM_SETTING_TEAM_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (TEAM, CONFIG),
-	                    nmc_property_team_get_config,
-	                    nmc_property_team_set_config,
-	                    NULL,
-	                    nmc_property_team_describe_config,
-	                    NULL,
-	                    NULL);
+	if (modified)
+		*value_coerced = g_strjoinv (" ", strv);
 
-	/* Add editable properties for NM_SETTING_TEAM_PORT_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (TEAM_PORT, CONFIG),
-	                    nmc_property_team_port_get_config,
-	                    nmc_property_team_set_config,
-	                    NULL,
-	                    nmc_property_team_describe_config,
-	                    NULL,
-	                    NULL);
+	return TRUE;
+}
 
-	/* Add editable properties for NM_SETTING_VLAN_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (VLAN, PARENT),
-	                    nmc_property_vlan_get_parent,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VLAN, ID),
-	                    nmc_property_vlan_get_id,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VLAN, FLAGS),
-	                    nmc_property_vlan_get_flags,
-	                    nmc_property_set_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VLAN, INGRESS_PRIORITY_MAP),
-	                    nmc_property_vlan_get_ingress_priority_map,
-	                    nmc_property_vlan_set_ingress_priority_map,
-	                    nmc_property_vlan_remove_ingress_priority_map,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VLAN, EGRESS_PRIORITY_MAP),
-	                    nmc_property_vlan_get_egress_priority_map,
-	                    nmc_property_vlan_set_egress_priority_map,
-	                    nmc_property_vlan_remove_egress_priority_map,
-	                    NULL,
-	                    NULL,
-	                    NULL);
+/*****************************************************************************/
 
-	/* Add editable properties for NM_SETTING_VPN_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (VPN, SERVICE_TYPE),
-	                    nmc_property_vpn_get_service_type,
-	                    nmc_property_set_vpn_service,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VPN, USER_NAME),
-	                    nmc_property_vpn_get_user_name,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VPN, DATA),
-	                    nmc_property_vpn_get_data,
-	                    nmc_property_vpn_set_data,
-	                    nmc_property_vpn_remove_option_data,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VPN, SECRETS),
-	                    nmc_property_vpn_get_secrets,
-	                    nmc_property_vpn_set_secrets,
-	                    nmc_property_vpn_remove_option_secret,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VPN, PERSISTENT),
-	                    nmc_property_vpn_get_persistent,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
+static void
+_env_warn_fcn_handle (const NMMetaEnvironment *environment,
+                      gpointer environment_user_data,
+                      NMMetaEnvWarnLevel warn_level,
+                      const char *fmt_l10n, /* the untranslated format string, but it is marked for translation using N_(). */
+                      va_list ap)
+{
+	gs_free char *m = NULL;
 
-	nmc_add_prop_funcs (GLUE (VPN, TIMEOUT),
-	                    nmc_property_vpn_get_timeout,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
+	NM_PRAGMA_WARNING_DISABLE("-Wformat-nonliteral")
+	m = g_strdup_vprintf (_(fmt_l10n), ap);
+	NM_PRAGMA_WARNING_REENABLE
 
-	/* Add editable properties for NM_SETTING_WIMAX_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (WIMAX, NETWORK_NAME),
-	                    nmc_property_wimax_get_network_name,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIMAX, MAC_ADDRESS),
-	                    nmc_property_wimax_get_mac_address,
-	                    nmc_property_set_mac,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
+	switch (warn_level) {
+	case NM_META_ENV_WARN_LEVEL_WARN:
+		g_print (_("Warning: %s\n"), m);
+		return;
+	case NM_META_ENV_WARN_LEVEL_INFO:
+		g_print (_("Info: %s\n"), m);
+		return;
+	}
+	g_print (_("Error: %s\n"), m);
+}
 
-	/* Add editable properties for NM_SETTING_WIRED_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (WIRED, PORT),
-	                    nmc_property_wired_get_port,
-	                    NULL, /* nmc_property_wired_set_port, */
-	                    NULL,
-	                    NULL,
-	                    NULL, /* nmc_property_wired_allowed_port, */
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRED, SPEED),
-	                    nmc_property_wired_get_speed,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRED, DUPLEX),
-	                    nmc_property_wired_get_duplex,
-	                    nmc_property_wired_set_duplex,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_wired_allowed_duplex,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRED, AUTO_NEGOTIATE),
-	                    nmc_property_wired_get_auto_negotiate,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRED, MAC_ADDRESS),
-	                    nmc_property_wired_get_mac_address,
-	                    nmc_property_set_mac,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRED, CLONED_MAC_ADDRESS),
-	                    nmc_property_wired_get_cloned_mac_address,
-	                    nmc_property_set_mac_cloned,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRED, GENERATE_MAC_ADDRESS_MASK),
-	                    nmc_property_wired_get_generate_mac_address_mask,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRED, MAC_ADDRESS_BLACKLIST),
-	                    nmc_property_wired_get_mac_address_blacklist,
-	                    nmc_property_wired_set_mac_address_blacklist,
-	                    nmc_property_wired_remove_mac_address_blacklist,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRED, MTU),
-	                    nmc_property_wired_get_mtu,
-	                    nmc_property_set_mtu,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRED, S390_SUBCHANNELS),
-	                    nmc_property_wired_get_s390_subchannels,
-	                    nmc_property_wired_set_s390_subchannels,
-	                    NULL,
-	                    nmc_property_wired_describe_s390_subchannels,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRED, S390_NETTYPE),
-	                    nmc_property_wired_get_s390_nettype,
-	                    nmc_property_wired_set_s390_nettype,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_wired_allowed_s390_nettype,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRED, S390_OPTIONS),
-	                    nmc_property_wired_get_s390_options,
-	                    nmc_property_wired_set_s390_options,
-	                    nmc_property_wired_remove_option_s390_options,
-	                    nmc_property_wired_describe_s390_options,
-	                    nmc_property_wired_allowed_s390_options,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRED, WAKE_ON_LAN),
-	                    nmc_property_wired_get_wake_on_lan,
-	                    nmc_property_wired_set_wake_on_lan,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRED, WAKE_ON_LAN_PASSWORD),
-	                    nmc_property_wired_get_wake_on_lan_password,
-	                    nmc_property_set_mac,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
+static NMDevice *const*
+_env_get_nm_devices (const NMMetaEnvironment *environment,
+                     gpointer environment_user_data,
+                     guint *out_len)
+{
+	NmCli *nmc = environment_user_data;
+	const GPtrArray *devices;
 
-	/* Add editable properties for NM_SETTING_WIRELESS_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (WIRELESS, SSID),
-	                    nmc_property_wireless_get_ssid,
-	                    nmc_property_set_ssid,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS, MODE),
-	                    nmc_property_wireless_get_mode,
-	                    nmc_property_wifi_set_mode,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_wifi_allowed_mode,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS, BAND),
-	                    nmc_property_wireless_get_band,
-	                    nmc_property_wifi_set_band,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_wifi_allowed_band,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS, CHANNEL),
-	                    nmc_property_wireless_get_channel,
-	                    nmc_property_wifi_set_channel,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS, BSSID),
-	                    nmc_property_wireless_get_bssid,
-	                    nmc_property_set_mac,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	/*
-	 * Do not allow setting 'rate' and 'tx-power'. They are not implemented in
-	 * NM core, nor in ifcfg-rh plugin (thus not preserved over re-reading).
-	 */
-	nmc_add_prop_funcs (GLUE (WIRELESS, RATE),
-	                    nmc_property_wireless_get_rate,
-	                    NULL, /* editing rate disabled */
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS, TX_POWER),
-	                    nmc_property_wireless_get_tx_power,
-	                    NULL, /* editing tx-power disabled */
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS, MAC_ADDRESS),
-	                    nmc_property_wireless_get_mac_address,
-	                    nmc_property_set_mac,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS, CLONED_MAC_ADDRESS),
-	                    nmc_property_wireless_get_cloned_mac_address,
-	                    nmc_property_set_mac_cloned,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS, GENERATE_MAC_ADDRESS_MASK),
-	                    nmc_property_wireless_get_generate_mac_address_mask,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS, MAC_ADDRESS_BLACKLIST),
-	                    nmc_property_wireless_get_mac_address_blacklist,
-	                    nmc_property_wireless_set_mac_address_blacklist,
-	                    nmc_property_wireless_remove_mac_address_blacklist,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS, SEEN_BSSIDS),
-	                    nmc_property_wireless_get_seen_bssids,
-	                    NULL, /* read-only */
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS, MTU),
-	                    nmc_property_wireless_get_mtu,
-	                    nmc_property_set_mtu,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS, HIDDEN),
-	                    nmc_property_wireless_get_hidden,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS, POWERSAVE),
-	                    nmc_property_wireless_get_powersave,
-	                    nmc_property_wireless_set_powersave,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS, MAC_ADDRESS_RANDOMIZATION),
-	                    nmc_property_wireless_get_mac_address_randomization,
-	                    nmc_property_wireless_set_mac_address_randomization,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
+	nm_assert (nmc);
 
-	/* Add editable properties for NM_SETTING_WIRELESS_SECURITY_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, KEY_MGMT),
-	                    nmc_property_wifi_sec_get_key_mgmt,
-	                    nmc_property_wifi_sec_set_key_mgmt,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_wifi_sec_allowed_key_mgmt,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, WEP_TX_KEYIDX),
-	                    nmc_property_wifi_sec_get_wep_tx_keyidx,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, AUTH_ALG),
-	                    nmc_property_wifi_sec_get_auth_alg,
-	                    nmc_property_wifi_sec_set_auth_alg,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_wifi_sec_allowed_auth_alg,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, PROTO),
-	                    nmc_property_wifi_sec_get_proto,
-	                    nmc_property_wifi_sec_set_proto,
-	                    nmc_property_wifi_sec_remove_proto,
-	                    NULL,
-	                    nmc_property_wifi_sec_allowed_proto,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, PAIRWISE),
-	                    nmc_property_wifi_sec_get_pairwise,
-	                    nmc_property_wifi_sec_set_pairwise,
-	                    nmc_property_wifi_sec_remove_pairwise,
-	                    NULL,
-	                    nmc_property_wifi_sec_allowed_pairwise,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, GROUP),
-	                    nmc_property_wifi_sec_get_group,
-	                    nmc_property_wifi_sec_set_group,
-	                    nmc_property_wifi_sec_remove_group,
-	                    NULL,
-	                    nmc_property_wifi_sec_allowed_group,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, LEAP_USERNAME),
-	                    nmc_property_wifi_sec_get_leap_username,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, WEP_KEY0),
-	                    nmc_property_wifi_sec_get_wep_key0,
-	                    nmc_property_wifi_set_wep_key,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, WEP_KEY1),
-	                    nmc_property_wifi_sec_get_wep_key1,
-	                    nmc_property_wifi_set_wep_key,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, WEP_KEY2),
-	                    nmc_property_wifi_sec_get_wep_key2,
-	                    nmc_property_wifi_set_wep_key,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, WEP_KEY3),
-	                    nmc_property_wifi_sec_get_wep_key3,
-	                    nmc_property_wifi_set_wep_key,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, WEP_KEY_FLAGS),
-	                    nmc_property_wifi_sec_get_wep_key_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, WEP_KEY_TYPE),
-	                    nmc_property_wifi_sec_get_wep_key_type,
-	                    nmc_property_wifi_set_wep_key_type,
-	                    NULL,
-	                    nmc_property_wifi_describe_wep_key_type,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, PSK),
-	                    nmc_property_wifi_sec_get_psk,
-	                    nmc_property_wifi_set_psk,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, PSK_FLAGS),
-	                    nmc_property_wifi_sec_get_psk_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, LEAP_PASSWORD),
-	                    nmc_property_wifi_sec_get_leap_password,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, LEAP_PASSWORD_FLAGS),
-	                    nmc_property_wifi_sec_get_leap_password_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
+	/* the returned list is *not* NULL terminated. Need to
+	 * provide and honor the out_len argument. */
+	nm_assert (out_len);
 
-	/* Add editable properties for NM_SETTING_TUN_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (TUN, MODE),
-	                    nmc_property_tun_get_mode,
-	                    nmc_property_tun_set_mode,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_tun_allowed_mode,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (TUN, OWNER),
-	                    nmc_property_tun_get_owner,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (TUN, GROUP),
-	                    nmc_property_tun_get_group,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (TUN, PI),
-	                    nmc_property_tun_get_pi,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (TUN, VNET_HDR),
-	                    nmc_property_tun_get_vnet_hdr,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (TUN, MULTI_QUEUE),
-	                    nmc_property_tun_get_multi_queue,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
+	devices = nm_client_get_devices (nmc->client);
+	if (!devices) {
+		*out_len = 0;
+		return NULL;
+	}
 
-	/* Add editable properties for NM_SETTING_IP_TUNNEL_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (IP_TUNNEL, MODE),
-	                    nmc_property_ip_tunnel_get_mode,
-	                    nmc_property_ip_tunnel_set_mode,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_ip_tunnel_allowed_mode,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (IP_TUNNEL, PARENT),
-	                    nmc_property_ip_tunnel_get_parent,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (IP_TUNNEL, LOCAL),
-	                    nmc_property_ip_tunnel_get_local,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (IP_TUNNEL, REMOTE),
-	                    nmc_property_ip_tunnel_get_remote,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (IP_TUNNEL, TTL),
-	                    nmc_property_ip_tunnel_get_ttl,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (IP_TUNNEL, TOS),
-	                    nmc_property_ip_tunnel_get_tos,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (IP_TUNNEL, PATH_MTU_DISCOVERY),
-	                    nmc_property_ip_tunnel_get_path_mtu_discovery,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (IP_TUNNEL, INPUT_KEY),
-	                    nmc_property_ip_tunnel_get_input_key,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (IP_TUNNEL, OUTPUT_KEY),
-	                    nmc_property_ip_tunnel_get_output_key,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (IP_TUNNEL, ENCAPSULATION_LIMIT),
-	                    nmc_property_ip_tunnel_get_encapsulation_limit,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (IP_TUNNEL, FLOW_LABEL),
-	                    nmc_property_ip_tunnel_get_flow_label,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (IP_TUNNEL, MTU),
-	                    nmc_property_ip_tunnel_get_mtu,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
+	*out_len = devices->len;
+	return (NMDevice *const*) devices->pdata;
+}
 
-	/* Add editable properties for NM_SETTING_MACSEC_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (MACSEC, PARENT),
-	                    nmc_property_macsec_get_parent,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (MACSEC, MODE),
-	                    nmc_property_macsec_get_mode,
-	                    nmc_property_macsec_set_mode,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_macsec_allowed_mode,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (MACSEC, ENCRYPT),
-	                    nmc_property_macsec_get_encrypt,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (MACSEC, MKA_CAK),
-	                    nmc_property_macsec_get_mka_cak,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (MACSEC, MKA_CAK_FLAGS),
-	                    nmc_property_macsec_get_mka_cak_flags,
-	                    nmc_property_set_secret_flags,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (MACSEC, MKA_CKN),
-	                    nmc_property_macsec_get_mka_ckn,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (MACSEC, PORT),
-	                    nmc_property_macsec_get_port,
-	                    nmc_property_set_int,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (MACSEC, VALIDATION),
-	                    nmc_property_macsec_get_validation,
-	                    nmc_property_macsec_set_validation,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_macsec_allowed_validation,
-	                    NULL);
+static NMRemoteConnection *const*
+_env_get_nm_connections (const NMMetaEnvironment *environment,
+                         gpointer environment_user_data,
+                         guint *out_len)
+{
+	NmCli *nmc = environment_user_data;
+	const GPtrArray *values;
 
-	/* Add editable properties for NM_SETTING_MACVLAN_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (MACVLAN, PARENT),
-	                    nmc_property_macvlan_get_parent,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (MACVLAN, MODE),
-	                    nmc_property_macvlan_get_mode,
-	                    nmc_property_macvlan_set_mode,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_macvlan_allowed_mode,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (MACVLAN, PROMISCUOUS),
-	                    nmc_property_macvlan_get_promiscuous,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (MACVLAN, TAP),
-	                    nmc_property_macvlan_get_tap,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
+	nm_assert (nmc);
 
-	/* Add editable properties for NM_SETTING_VXLAN_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (VXLAN, PARENT),
-	                    nmc_property_vxlan_get_parent,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VXLAN, ID),
-	                    nmc_property_vxlan_get_id,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VXLAN, LOCAL),
-	                    nmc_property_vxlan_get_local,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VXLAN, REMOTE),
-	                    nmc_property_vxlan_get_remote,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VXLAN, SOURCE_PORT_MIN),
-	                    nmc_property_vxlan_get_source_port_min,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VXLAN, SOURCE_PORT_MAX),
-	                    nmc_property_vxlan_get_source_port_max,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VXLAN, DESTINATION_PORT),
-	                    nmc_property_vxlan_get_destination_port,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VXLAN, TOS),
-	                    nmc_property_vxlan_get_tos,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VXLAN, TTL),
-	                    nmc_property_vxlan_get_ttl,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VXLAN, AGEING),
-	                    nmc_property_vxlan_get_ageing,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VXLAN, LIMIT),
-	                    nmc_property_vxlan_get_limit,
-	                    nmc_property_set_uint,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VXLAN, LEARNING),
-	                    nmc_property_vxlan_get_learning,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VXLAN, PROXY),
-	                    nmc_property_vxlan_get_proxy,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VXLAN, RSC),
-	                    nmc_property_vxlan_get_rsc,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VXLAN, L2_MISS),
-	                    nmc_property_vxlan_get_l2_miss,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (VXLAN, L3_MISS),
-	                    nmc_property_vxlan_get_l3_miss,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
+	/* the returned list is *not* NULL terminated. Need to
+	 * provide and honor the out_len argument. */
+	nm_assert (out_len);
 
-	/* Add editable properties for NM_SETTING_PROXY_SETTING_NAME */
-	nmc_add_prop_funcs (GLUE (PROXY, METHOD),
-	                    nmc_property_proxy_get_method,
-	                    nmc_property_proxy_set_method,
-	                    NULL,
-	                    NULL,
-	                    nmc_property_proxy_allowed_method,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PROXY, BROWSER_ONLY),
-	                    nmc_property_proxy_get_browser_only,
-	                    nmc_property_set_bool,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PROXY, PAC_URL),
-	                    nmc_property_proxy_get_pac_url,
-	                    nmc_property_set_string,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-	nmc_add_prop_funcs (GLUE (PROXY, PAC_SCRIPT),
-	                    nmc_property_proxy_get_pac_script,
-	                    nmc_property_proxy_set_pac_script,
-	                    NULL,
-	                    NULL,
-	                    NULL,
-	                    NULL);
-}
+	values = nm_client_get_connections (nmc->client);
+	if (!values) {
+		*out_len = 0;
+		return NULL;
+	}
 
-void
-nmc_properties_cleanup ()
-{
-	if (nmc_properties)
-		g_hash_table_destroy (nmc_properties);
+	*out_len = values->len;
+	return (NMRemoteConnection *const*) values->pdata;
 }
 
-static const NmcPropertyFuncs *
-nmc_properties_find (const char *s_name, const char *p_name)
-{
-	char *key;
-	gsize p_l, s_l;
+/*****************************************************************************/
 
-	nmc_properties_init ();
+const NMMetaEnvironment *const nmc_meta_environment = &((NMMetaEnvironment) {
+	.warn_fcn = _env_warn_fcn_handle,
+	.get_nm_devices = _env_get_nm_devices,
+	.get_nm_connections = _env_get_nm_connections,
+});
 
-	s_l = strlen (s_name);
-	p_l = strlen (p_name);
-	key = g_alloca (s_l + p_l + 1);
-	memcpy (&key[  0], s_name, s_l);
-	memcpy (&key[s_l], p_name, p_l + 1);
-	return (NmcPropertyFuncs *) g_hash_table_lookup (nmc_properties, key);
-}
+NmCli *const nmc_meta_environment_arg = &nm_cli;
 
 static char *
-get_property_val (NMSetting *setting, const char *prop, NmcPropertyGetType get_type, GError **error)
+get_property_val (NMSetting *setting, const char *prop, NMMetaAccessorGetType get_type, gboolean show_secrets, GError **error)
 {
-	const NmcPropertyFuncs *item;
+	const NMMetaPropertyInfo *property_info;
 
-	g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+	g_return_val_if_fail (NM_IS_SETTING (setting), NULL);
+	g_return_val_if_fail (!error || !*error, NULL);
+	g_return_val_if_fail (NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_PARSABLE, NM_META_ACCESSOR_GET_TYPE_PRETTY), NULL);
 
-	item = nmc_properties_find (nm_setting_get_name (setting), prop);
-	if (item && item->get_func)
-		return item->get_func (setting, get_type);
+	if ((property_info = nm_meta_property_info_find_by_setting (setting, prop))) {
+		if (property_info->property_type->get_fcn) {
+			NMMetaAccessorGetOutFlags out_flags = NM_META_ACCESSOR_GET_OUT_FLAGS_NONE;
+			char *to_free = NULL;
+			const char *value;
+
+			value = property_info->property_type->get_fcn (property_info,
+			                                               nmc_meta_environment,
+			                                               nmc_meta_environment_arg,
+			                                               setting,
+			                                               get_type,
+			                                               show_secrets ? NM_META_ACCESSOR_GET_FLAGS_SHOW_SECRETS : 0,
+			                                               &out_flags,
+			                                               (gpointer *) &to_free);
+			nm_assert (!out_flags);
+			return to_free ?: g_strdup (value);
+		}
+	}
 
 	g_set_error_literal (error, 1, 0, _("don't know how to get the property value"));
 	return NULL;
@@ -8417,7 +488,7 @@ get_property_val (NMSetting *setting, const char *prop, NmcPropertyGetType get_t
 char *
 nmc_setting_get_property (NMSetting *setting, const char *prop, GError **error)
 {
-	return get_property_val (setting, prop, NMC_PROPERTY_GET_PRETTY, error);
+	return get_property_val (setting, prop, NM_META_ACCESSOR_GET_TYPE_PRETTY, TRUE, error);
 }
 
 /*
@@ -8427,33 +498,70 @@ nmc_setting_get_property (NMSetting *setting, const char *prop, GError **error)
 char *
 nmc_setting_get_property_parsable (NMSetting *setting, const char *prop, GError **error)
 {
-	return get_property_val (setting, prop, NMC_PROPERTY_GET_PARSABLE, error);
+	return get_property_val (setting, prop, NM_META_ACCESSOR_GET_TYPE_PARSABLE, TRUE, error);
+}
+
+static gboolean
+_set_fcn_call (const NMMetaPropertyInfo *property_info,
+               NMSetting *setting,
+               const char *value,
+               GError **error)
+{
+	return property_info->property_type->set_fcn (property_info,
+	                                              nmc_meta_environment,
+	                                              nmc_meta_environment_arg,
+	                                              setting,
+	                                              value,
+	                                              error);
 }
 
 /*
  * Generic function for setting property value.
  *
- * Sets property=val in setting by calling specialized functions.
- * If val is NULL then default property value is set.
+ * Sets property=value in setting by calling specialized functions.
+ * If value is NULL then default property value is set.
  *
  * Returns: TRUE on success; FALSE on failure and sets error
  */
 gboolean
-nmc_setting_set_property (NMSetting *setting, const char *prop, const char *val, GError **error)
+nmc_setting_set_property (NMSetting *setting, const char *prop, const char *value, GError **error)
 {
-	const NmcPropertyFuncs *item;
+	const NMMetaPropertyInfo *property_info;
 
 	g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
 	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-	item = nmc_properties_find (nm_setting_get_name (setting), prop);
-	if (item && item->set_func) {
-		if (!val) {
+	if ((property_info = nm_meta_property_info_find_by_setting (setting, prop))) {
+
+		if (!value) {
 			/* No value argument sets default value */
 			nmc_property_set_default_value (setting, prop);
 			return TRUE;
 		}
-		return item->set_func (setting, prop, val, error);
+
+		if (property_info->property_type->set_fcn) {
+			switch (property_info->setting_info->general->meta_type) {
+			case NM_META_SETTING_TYPE_CONNECTION:
+				if (nm_streq (property_info->property_name, NM_SETTING_CONNECTION_SECONDARIES)) {
+					gs_free char *value_coerced = NULL;
+
+					if (!_set_fcn_precheck_connection_secondaries (value, &value_coerced, error))
+						return FALSE;
+
+					return _set_fcn_call (property_info,
+					                      setting,
+					                      value_coerced ?: value,
+					                      error);
+				}
+				break;
+			default:
+				break;
+			}
+			return _set_fcn_call (property_info,
+			                      setting,
+			                      value,
+			                      error);
+		}
 	}
 
 	g_set_error_literal (error, 1, 0, _("the property can't be changed"));
@@ -8486,16 +594,18 @@ nmc_property_set_default_value (NMSetting *setting, const char *prop)
 gboolean
 nmc_setting_reset_property (NMSetting *setting, const char *prop, GError **error)
 {
-	const NmcPropertyFuncs *item;
+	const NMMetaPropertyInfo *property_info;
 
 	g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
 	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-	item = nmc_properties_find (nm_setting_get_name (setting), prop);
-	if (item && item->set_func) {
-		nmc_property_set_default_value (setting, prop);
-		return TRUE;
+	if ((property_info = nm_meta_property_info_find_by_setting (setting, prop))) {
+		if (property_info->property_type->set_fcn) {
+			nmc_property_set_default_value (setting, prop);
+			return TRUE;
+		}
 	}
+
 	g_set_error_literal (error, 1, 0, _("the property can't be changed"));
 	return FALSE;
 }
@@ -8516,14 +626,22 @@ nmc_setting_remove_property_option (NMSetting *setting,
                                     guint32 idx,
                                     GError **error)
 {
-	const NmcPropertyFuncs *item;
+	const NMMetaPropertyInfo *property_info;
 
 	g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
 	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-	item = nmc_properties_find (nm_setting_get_name (setting), prop);
-	if (item && item->remove_func)
-		return item->remove_func (setting, prop, option, idx, error);
+	if ((property_info = nm_meta_property_info_find_by_setting (setting, prop))) {
+		if (property_info->property_type->remove_fcn) {
+			return property_info->property_type->remove_fcn (property_info,
+			                                                 nmc_meta_environment,
+			                                                 nmc_meta_environment_arg,
+			                                                 setting,
+			                                                 option,
+			                                                 idx,
+			                                                 error);
+		}
+	}
 
 	return TRUE;
 }
@@ -8559,26 +677,27 @@ nmc_setting_get_valid_properties (NMSetting *setting)
 	return valid_props;
 }
 
-/*
- * Return allowed values for 'prop' as a string.
- */
-const char **
-nmc_setting_get_property_allowed_values (NMSetting *setting, const char *prop)
+const char *const*
+nmc_setting_get_property_allowed_values (NMSetting *setting, const char *prop, char ***out_to_free)
 {
-
-	const NmcPropertyFuncs *item;
+	const NMMetaPropertyInfo *property_info;
 
 	g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
+	g_return_val_if_fail (out_to_free, FALSE);
+
+	*out_to_free = NULL;
 
-	item = nmc_properties_find (nm_setting_get_name (setting), prop);
-	if (item && item->values_func)
-		return item->values_func (setting, prop);
+	if ((property_info = nm_meta_property_info_find_by_setting (setting, prop))) {
+		if (property_info->property_type->values_fcn) {
+			return property_info->property_type->values_fcn (property_info,
+			                                                 out_to_free);
+		} else if (property_info->property_typ_data && property_info->property_typ_data->values_static)
+			return property_info->property_typ_data->values_static;
+	}
 
 	return NULL;
 }
 
-#include "settings-docs.c"
-
 /*
  * Create a description string for a property.
  *
@@ -8590,22 +709,33 @@ nmc_setting_get_property_allowed_values (NMSetting *setting, const char *prop)
 char *
 nmc_setting_get_property_desc (NMSetting *setting, const char *prop)
 {
-	const NmcPropertyFuncs *item;
+	gs_free char *desc_to_free = NULL;
 	const char *setting_desc = NULL;
 	const char *setting_desc_title = "";
 	const char *nmcli_desc = NULL;
 	const char *nmcli_desc_title = "";
 	const char *nmcli_nl = "";
+	const NMMetaPropertyInfo *property_info;
+	const char *desc = NULL;
 
 	g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
 
-	setting_desc = nmc_setting_get_property_doc (setting, prop);
-	if (setting_desc)
+	property_info = nm_meta_property_info_find_by_setting (setting, prop);
+	if (!property_info)
+		return NULL;
+
+	if (property_info->describe_doc) {
+		setting_desc = _(property_info->describe_doc);
 		setting_desc_title = _("[NM property description]");
+	}
+
+	if (property_info->property_type->describe_fcn) {
+		desc = property_info->property_type->describe_fcn (property_info, &desc_to_free);
+	} else
+		desc = _(property_info->describe_message);
 
-	item = nmc_properties_find (nm_setting_get_name (setting), prop);
-	if (item && item->describe_func) {
-		nmcli_desc = item->describe_func (setting, prop);
+	if (desc) {
+		nmcli_desc = desc;
 		nmcli_desc_title = _("[nmcli specific description]");
 		nmcli_nl = "\n";
 	}
@@ -8652,1271 +782,35 @@ nmc_property_set_gvalue (NMSetting *setting, const char *prop, GValue *value)
 	return FALSE;
 }
 
-/*----------------------------------------------------------------------------*/
-
-#define GET_SECRET(show, setting, func, type) \
-	(show ? func (setting, type) : g_strdup (_("<hidden>")))
-
-static gboolean
-setting_connection_details (NMSetting *setting, NmCli *nmc,
-                            const char *one_prop,
-                            gboolean secrets,
-                            NmcPropertyGetType type)
-{
-	NMSettingConnection *s_con = NM_SETTING_CONNECTION (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_CONNECTION (s_con), FALSE);
-
-	tmpl = nmc_fields_setting_connection;
-	tmpl_len = sizeof (nmc_fields_setting_connection);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_CONNECTION_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_connection_get_id (setting, type));
-	set_val_str (arr, 2, nmc_property_connection_get_uuid (setting, type));
-	set_val_str (arr, 3, nmc_property_connection_get_stable_id (setting, type));
-	set_val_str (arr, 4, nmc_property_connection_get_interface_name (setting, type));
-	set_val_str (arr, 5, nmc_property_connection_get_type (setting, type));
-	set_val_str (arr, 6, nmc_property_connection_get_autoconnect (setting, type));
-	set_val_str (arr, 7, nmc_property_connection_get_autoconnect_priority (setting, type));
-	set_val_str (arr, 8, nmc_property_connection_get_autoconnect_retries (setting, type));
-	set_val_str (arr, 9, nmc_property_connection_get_timestamp (setting, type));
-	set_val_str (arr, 10, nmc_property_connection_get_read_only (setting, type));
-	set_val_str (arr, 11, nmc_property_connection_get_permissions (setting, type));
-	set_val_str (arr, 12, nmc_property_connection_get_zone (setting, type));
-	set_val_str (arr, 13, nmc_property_connection_get_master (setting, type));
-	set_val_str (arr, 14, nmc_property_connection_get_slave_type (setting, type));
-	set_val_str (arr, 15, nmc_property_connection_get_autoconnect_slaves (setting, type));
-	set_val_str (arr, 16, nmc_property_connection_get_secondaries (setting, type));
-	set_val_str (arr, 17, nmc_property_connection_get_gateway_ping_timeout (setting, type));
-	set_val_str (arr, 18, nmc_property_connection_get_metered (setting, type));
-	set_val_str (arr, 19, nmc_property_connection_get_lldp (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_wired_details (NMSetting *setting,
-                       NmCli *nmc,
-                       const char *one_prop,
-                       gboolean secrets,
-                       NmcPropertyGetType type)
-{
-	NMSettingWired *s_wired = NM_SETTING_WIRED (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_WIRED (s_wired), FALSE);
-
-	tmpl = nmc_fields_setting_wired;
-	tmpl_len = sizeof (nmc_fields_setting_wired);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_WIRED_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_wired_get_port (setting, type));
-	set_val_str (arr, 2, nmc_property_wired_get_speed (setting, type));
-	set_val_str (arr, 3, nmc_property_wired_get_duplex (setting, type));
-	set_val_str (arr, 4, nmc_property_wired_get_auto_negotiate (setting, type));
-	set_val_str (arr, 5, nmc_property_wired_get_mac_address (setting, type));
-	set_val_str (arr, 6, nmc_property_wired_get_cloned_mac_address (setting, type));
-	set_val_str (arr, 7, nmc_property_wired_get_generate_mac_address_mask (setting, type));
-	set_val_str (arr, 8, nmc_property_wired_get_mac_address_blacklist (setting, type));
-	set_val_str (arr, 9, nmc_property_wired_get_mtu (setting, type));
-	set_val_str (arr, 10, nmc_property_wired_get_s390_subchannels (setting, type));
-	set_val_str (arr, 11, nmc_property_wired_get_s390_nettype (setting, type));
-	set_val_str (arr, 12, nmc_property_wired_get_s390_options (setting, type));
-	set_val_str (arr, 13, nmc_property_wired_get_wake_on_lan (setting, type));
-	set_val_str (arr, 14, nmc_property_wired_get_wake_on_lan_password (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_802_1X_details (NMSetting *setting,
-                        NmCli *nmc,
-                        const char *one_prop,
-                        gboolean secrets,
-                        NmcPropertyGetType type)
-{
-	NMSetting8021x *s_8021x = NM_SETTING_802_1X (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_802_1X (s_8021x), FALSE);
-
-	tmpl = nmc_fields_setting_8021X;
-	tmpl_len = sizeof (nmc_fields_setting_8021X);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_802_1X_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_802_1X_get_eap (setting, type));
-	set_val_str (arr, 2, nmc_property_802_1X_get_identity (setting, type));
-	set_val_str (arr, 3, nmc_property_802_1X_get_anonymous_identity (setting, type));
-	set_val_str (arr, 4, nmc_property_802_1X_get_pac_file (setting, type));
-	set_val_str (arr, 5, nmc_property_802_1X_get_ca_cert (setting, type));
-	set_val_str (arr, 6, GET_SECRET (secrets, setting, nmc_property_802_1X_get_ca_cert_password, type));
-	set_val_str (arr, 7, nmc_property_802_1X_get_ca_cert_password_flags (setting, type));
-	set_val_str (arr, 8, nmc_property_802_1X_get_ca_path (setting, type));
-	set_val_str (arr, 9, nmc_property_802_1X_get_subject_match (setting, type));
-	set_val_str (arr, 10, nmc_property_802_1X_get_altsubject_matches (setting, type));
-	set_val_str (arr, 11, nmc_property_802_1X_get_domain_suffix_match (setting, type));
-	set_val_str (arr, 12, nmc_property_802_1X_get_client_cert (setting, type, secrets));
-	set_val_str (arr, 13, GET_SECRET (secrets, setting, nmc_property_802_1X_get_client_cert_password, type));
-	set_val_str (arr, 14, nmc_property_802_1X_get_client_cert_password_flags (setting, type));
-	set_val_str (arr, 15, nmc_property_802_1X_get_phase1_peapver (setting, type));
-	set_val_str (arr, 16, nmc_property_802_1X_get_phase1_peaplabel (setting, type));
-	set_val_str (arr, 17, nmc_property_802_1X_get_phase1_fast_provisioning (setting, type));
-	set_val_str (arr, 18, nmc_property_802_1X_get_phase1_auth_flags (setting, type));
-	set_val_str (arr, 19, nmc_property_802_1X_get_phase2_auth (setting, type));
-	set_val_str (arr, 20, nmc_property_802_1X_get_phase2_autheap (setting, type));
-	set_val_str (arr, 21, nmc_property_802_1X_get_phase2_ca_cert (setting, type));
-	set_val_str (arr, 22, GET_SECRET (secrets, setting, nmc_property_802_1X_get_phase2_ca_cert_password, type));
-	set_val_str (arr, 23, nmc_property_802_1X_get_phase2_ca_cert_password_flags (setting, type));
-	set_val_str (arr, 24, nmc_property_802_1X_get_phase2_ca_path (setting, type));
-	set_val_str (arr, 25, nmc_property_802_1X_get_phase2_subject_match (setting, type));
-	set_val_str (arr, 26, nmc_property_802_1X_get_phase2_altsubject_matches (setting, type));
-	set_val_str (arr, 27, nmc_property_802_1X_get_phase2_domain_suffix_match (setting, type));
-	set_val_str (arr, 28, nmc_property_802_1X_get_phase2_client_cert (setting, type, secrets));
-	set_val_str (arr, 29, GET_SECRET (secrets, setting, nmc_property_802_1X_get_phase2_client_cert_password, type));
-	set_val_str (arr, 30, nmc_property_802_1X_get_phase2_client_cert_password_flags (setting, type));
-	set_val_str (arr, 31, GET_SECRET (secrets, setting, nmc_property_802_1X_get_password, type));
-	set_val_str (arr, 32, nmc_property_802_1X_get_password_flags (setting, type));
-	set_val_str (arr, 33, GET_SECRET (secrets, setting, nmc_property_802_1X_get_password_raw, type));
-	set_val_str (arr, 34, nmc_property_802_1X_get_password_raw_flags (setting, type));
-	set_val_str (arr, 35, nmc_property_802_1X_get_private_key (setting, type, secrets));
-	set_val_str (arr, 36, GET_SECRET (secrets, setting, nmc_property_802_1X_get_private_key_password, type));
-	set_val_str (arr, 37, nmc_property_802_1X_get_private_key_password_flags (setting, type));
-	set_val_str (arr, 38, nmc_property_802_1X_get_phase2_private_key (setting, type, secrets));
-	set_val_str (arr, 39, GET_SECRET (secrets, setting, nmc_property_802_1X_get_phase2_private_key_password, type));
-	set_val_str (arr, 40, nmc_property_802_1X_get_phase2_private_key_password_flags (setting, type));
-	set_val_str (arr, 41, GET_SECRET (secrets, setting, nmc_property_802_1X_get_pin, type));
-	set_val_str (arr, 42, nmc_property_802_1X_get_pin_flags (setting, type));
-	set_val_str (arr, 43, nmc_property_802_1X_get_system_ca_certs (setting, type));
-	set_val_str (arr, 44, nmc_property_802_1X_get_auth_timeout (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_wireless_details (NMSetting *setting,
-                          NmCli *nmc,
-                          const char *one_prop,
-                          gboolean secrets,
-                          NmcPropertyGetType type)
-{
-	NMSettingWireless *s_wireless = NM_SETTING_WIRELESS (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_WIRELESS (s_wireless), FALSE);
-
-	tmpl = nmc_fields_setting_wireless;
-	tmpl_len = sizeof (nmc_fields_setting_wireless);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_WIRELESS_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_wireless_get_ssid (setting, type));
-	set_val_str (arr, 2, nmc_property_wireless_get_mode (setting, type));
-	set_val_str (arr, 3, nmc_property_wireless_get_band (setting, type));
-	set_val_str (arr, 4, nmc_property_wireless_get_channel (setting, type));
-	set_val_str (arr, 5, nmc_property_wireless_get_bssid (setting, type));
-	set_val_str (arr, 6, nmc_property_wireless_get_rate (setting, type));
-	set_val_str (arr, 7, nmc_property_wireless_get_tx_power (setting, type));
-	set_val_str (arr, 8, nmc_property_wireless_get_mac_address (setting, type));
-	set_val_str (arr, 9, nmc_property_wireless_get_cloned_mac_address (setting, type));
-	set_val_str (arr, 10, nmc_property_wireless_get_generate_mac_address_mask (setting, type));
-	set_val_str (arr, 11, nmc_property_wireless_get_mac_address_blacklist (setting, type));
-	set_val_str (arr, 12, nmc_property_wireless_get_mac_address_randomization (setting, type));
-	set_val_str (arr, 13, nmc_property_wireless_get_mtu (setting, type));
-	set_val_str (arr, 14, nmc_property_wireless_get_seen_bssids (setting, type));
-	set_val_str (arr, 15, nmc_property_wireless_get_hidden (setting, type));
-	set_val_str (arr, 16, nmc_property_wireless_get_powersave (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_wireless_security_details (NMSetting *setting,
-                                   NmCli *nmc,
-                                   const char *one_prop,
-                                   gboolean secrets,
-                                   NmcPropertyGetType type)
-{
-	NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_WIRELESS_SECURITY (s_wireless_sec), FALSE);
-
-	tmpl = nmc_fields_setting_wireless_security;
-	tmpl_len = sizeof (nmc_fields_setting_wireless_security);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_WIRELESS_SECURITY_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_wifi_sec_get_key_mgmt (setting, type));
-	set_val_str (arr, 2, nmc_property_wifi_sec_get_wep_tx_keyidx (setting, type));
-	set_val_str (arr, 3, nmc_property_wifi_sec_get_auth_alg (setting, type));
-	set_val_str (arr, 4, nmc_property_wifi_sec_get_proto (setting, type));
-	set_val_str (arr, 5, nmc_property_wifi_sec_get_pairwise (setting, type));
-	set_val_str (arr, 6, nmc_property_wifi_sec_get_group (setting, type));
-	set_val_str (arr, 7, nmc_property_wifi_sec_get_leap_username (setting, type));
-	set_val_str (arr, 8, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_wep_key0, type));
-	set_val_str (arr, 9, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_wep_key1, type));
-	set_val_str (arr, 10, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_wep_key2, type));
-	set_val_str (arr, 11, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_wep_key3, type));
-	set_val_str (arr, 12, nmc_property_wifi_sec_get_wep_key_flags (setting, type));
-	set_val_str (arr, 13, nmc_property_wifi_sec_get_wep_key_type (setting, type));
-	set_val_str (arr, 14, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_psk, type));
-	set_val_str (arr, 15, nmc_property_wifi_sec_get_psk_flags (setting, type));
-	set_val_str (arr, 16, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_leap_password, type));
-	set_val_str (arr, 17, nmc_property_wifi_sec_get_leap_password_flags (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_ip4_config_details (NMSetting *setting,
-                            NmCli *nmc,
-                            const char *one_prop,
-                            gboolean secrets,
-                            NmcPropertyGetType type)
-{
-	NMSettingIPConfig *s_ip4 = NM_SETTING_IP_CONFIG (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_IP4_CONFIG (s_ip4), FALSE);
-
-	tmpl = nmc_fields_setting_ip4_config;
-	tmpl_len = sizeof (nmc_fields_setting_ip4_config);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_IP4_CONFIG_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_ipv4_get_method (setting, type));
-	set_val_str (arr, 2, nmc_property_ipv4_get_dns (setting, type));
-	set_val_str (arr, 3, nmc_property_ipv4_get_dns_search (setting, type));
-	set_val_str (arr, 4, nmc_property_ipv4_get_dns_options (setting, type));
-	set_val_str (arr, 5, nmc_property_ipv4_get_dns_priority (setting, type));
-	set_val_str (arr, 6, nmc_property_ip_get_addresses (setting, type));
-	set_val_str (arr, 7, nmc_property_ipv4_get_gateway (setting, type));
-	set_val_str (arr, 8, nmc_property_ipv4_get_routes (setting, type));
-	set_val_str (arr, 9, nmc_property_ipv4_get_route_metric (setting, type));
-	set_val_str (arr, 10, nmc_property_ipv4_get_ignore_auto_routes (setting, type));
-	set_val_str (arr, 11, nmc_property_ipv4_get_ignore_auto_dns (setting, type));
-	set_val_str (arr, 12, nmc_property_ipv4_get_dhcp_client_id (setting, type));
-	set_val_str (arr, 13, nmc_property_ipv4_get_dhcp_timeout (setting, type));
-	set_val_str (arr, 14, nmc_property_ipv4_get_dhcp_send_hostname (setting, type));
-	set_val_str (arr, 15, nmc_property_ipv4_get_dhcp_hostname (setting, type));
-	set_val_str (arr, 16, nmc_property_ipv4_get_dhcp_fqdn (setting, type));
-	set_val_str (arr, 17, nmc_property_ipv4_get_never_default (setting, type));
-	set_val_str (arr, 18, nmc_property_ipv4_get_may_fail (setting, type));
-	set_val_str (arr, 19, nmc_property_ipv4_get_dad_timeout (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_ip6_config_details (NMSetting *setting,
-                            NmCli *nmc,
-                            const char *one_prop,
-                            gboolean secrets,
-                            NmcPropertyGetType type)
-{
-	NMSettingIPConfig *s_ip6 = NM_SETTING_IP_CONFIG (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_IP6_CONFIG (s_ip6), FALSE);
-
-	tmpl = nmc_fields_setting_ip6_config;
-	tmpl_len = sizeof (nmc_fields_setting_ip6_config);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_IP6_CONFIG_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_ipv6_get_method (setting, type));
-	set_val_str (arr, 2, nmc_property_ipv6_get_dns (setting, type));
-	set_val_str (arr, 3, nmc_property_ipv6_get_dns_search (setting, type));
-	set_val_str (arr, 4, nmc_property_ipv6_get_dns_options (setting, type));
-	set_val_str (arr, 5, nmc_property_ipv6_get_dns_priority (setting, type));
-	set_val_str (arr, 6, nmc_property_ip_get_addresses (setting, type));
-	set_val_str (arr, 7, nmc_property_ipv6_get_gateway (setting, type));
-	set_val_str (arr, 8, nmc_property_ipv6_get_routes (setting, type));
-	set_val_str (arr, 9, nmc_property_ipv6_get_route_metric (setting, type));
-	set_val_str (arr, 10, nmc_property_ipv6_get_ignore_auto_routes (setting, type));
-	set_val_str (arr, 11, nmc_property_ipv6_get_ignore_auto_dns (setting, type));
-	set_val_str (arr, 12, nmc_property_ipv6_get_never_default (setting, type));
-	set_val_str (arr, 13, nmc_property_ipv6_get_may_fail (setting, type));
-	set_val_str (arr, 14, nmc_property_ipv6_get_ip6_privacy (setting, type));
-	set_val_str (arr, 15, nmc_property_ipv6_get_addr_gen_mode (setting, type));
-	set_val_str (arr, 16, nmc_property_ipv6_get_dhcp_send_hostname (setting, type));
-	set_val_str (arr, 17, nmc_property_ipv6_get_dhcp_hostname (setting, type));
-	set_val_str (arr, 18, nmc_property_ipv6_get_token (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_serial_details (NMSetting *setting,
-                        NmCli *nmc,
-                        const char *one_prop,
-                        gboolean secrets,
-                        NmcPropertyGetType type)
-{
-	NMSettingSerial *s_serial = NM_SETTING_SERIAL (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_SERIAL (s_serial), FALSE);
-
-	tmpl = nmc_fields_setting_serial;
-	tmpl_len = sizeof (nmc_fields_setting_serial);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_SERIAL_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_serial_get_baud (setting, type));
-	set_val_str (arr, 2, nmc_property_serial_get_bits (setting, type));
-	set_val_str (arr, 3, nmc_property_serial_get_parity (setting, type));
-	set_val_str (arr, 4, nmc_property_serial_get_stopbits (setting, type));
-	set_val_str (arr, 5, nmc_property_serial_get_send_delay (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_ppp_details (NMSetting *setting, NmCli *nmc,
-                     const char *one_prop,
-                     gboolean secrets,
-                     NmcPropertyGetType type)
-{
-	NMSettingPpp *s_ppp = NM_SETTING_PPP (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_PPP (s_ppp), FALSE);
-
-	tmpl = nmc_fields_setting_ppp;
-	tmpl_len = sizeof (nmc_fields_setting_ppp);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_PPP_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_ppp_get_noauth (setting, type));
-	set_val_str (arr, 2, nmc_property_ppp_get_refuse_eap (setting, type));
-	set_val_str (arr, 3, nmc_property_ppp_get_refuse_pap (setting, type));
-	set_val_str (arr, 4, nmc_property_ppp_get_refuse_chap (setting, type));
-	set_val_str (arr, 5, nmc_property_ppp_get_refuse_mschap (setting, type));
-	set_val_str (arr, 6, nmc_property_ppp_get_refuse_mschapv2 (setting, type));
-	set_val_str (arr, 7, nmc_property_ppp_get_nobsdcomp (setting, type));
-	set_val_str (arr, 8, nmc_property_ppp_get_nodeflate (setting, type));
-	set_val_str (arr, 9, nmc_property_ppp_get_no_vj_comp (setting, type));
-	set_val_str (arr, 10, nmc_property_ppp_get_require_mppe (setting, type));
-	set_val_str (arr, 11, nmc_property_ppp_get_require_mppe_128 (setting, type));
-	set_val_str (arr, 12, nmc_property_ppp_get_mppe_stateful (setting, type));
-	set_val_str (arr, 13, nmc_property_ppp_get_crtscts (setting, type));
-	set_val_str (arr, 14, nmc_property_ppp_get_baud (setting, type));
-	set_val_str (arr, 15, nmc_property_ppp_get_mru (setting, type));
-	set_val_str (arr, 16, nmc_property_ppp_get_mtu (setting, type));
-	set_val_str (arr, 17, nmc_property_ppp_get_lcp_echo_failure (setting, type));
-	set_val_str (arr, 18, nmc_property_ppp_get_lcp_echo_interval (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_pppoe_details (NMSetting *setting,
-                       NmCli *nmc,
-                       const char *one_prop,
-                       gboolean secrets,
-                       NmcPropertyGetType type)
-{
-	NMSettingPppoe *s_pppoe = NM_SETTING_PPPOE (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_PPPOE (s_pppoe), FALSE);
-
-	tmpl = nmc_fields_setting_pppoe;
-	tmpl_len = sizeof (nmc_fields_setting_pppoe);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_PPPOE_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_pppoe_get_service (setting, type));
-	set_val_str (arr, 2, nmc_property_pppoe_get_username (setting, type));
-	set_val_str (arr, 3, GET_SECRET (secrets, setting, nmc_property_pppoe_get_password, type));
-	set_val_str (arr, 4, nmc_property_pppoe_get_password_flags (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_gsm_details (NMSetting *setting,
-                     NmCli *nmc,
-                     const char *one_prop,
-                     gboolean secrets,
-                     NmcPropertyGetType type)
-{
-	NMSettingGsm *s_gsm = NM_SETTING_GSM (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_GSM (s_gsm), FALSE);
-
-	tmpl = nmc_fields_setting_gsm;
-	tmpl_len = sizeof (nmc_fields_setting_gsm);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_GSM_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_gsm_get_number (setting, type));
-	set_val_str (arr, 2, nmc_property_gsm_get_username (setting, type));
-	set_val_str (arr, 3, GET_SECRET (secrets, setting, nmc_property_gsm_get_password, type));
-	set_val_str (arr, 4, nmc_property_gsm_get_password_flags (setting, type));
-	set_val_str (arr, 5, nmc_property_gsm_get_apn (setting, type));
-	set_val_str (arr, 6, nmc_property_gsm_get_network_id (setting, type));
-	set_val_str (arr, 7, GET_SECRET (secrets, setting, nmc_property_gsm_get_pin, type));
-	set_val_str (arr, 8, nmc_property_gsm_get_pin_flags (setting, type));
-	set_val_str (arr, 9, nmc_property_gsm_get_home_only (setting, type));
-	set_val_str (arr, 10, nmc_property_gsm_get_device_id (setting, type));
-	set_val_str (arr, 11, nmc_property_gsm_get_sim_id (setting, type));
-	set_val_str (arr, 12, nmc_property_gsm_get_sim_operator_id (setting, type));
-	set_val_str (arr, 13, nmc_property_gsm_get_mtu (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_cdma_details (NMSetting *setting,
-                      NmCli *nmc,
-                      const char *one_prop,
-                      gboolean secrets,
-                      NmcPropertyGetType type)
-{
-	NMSettingCdma *s_cdma = NM_SETTING_CDMA (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_CDMA (s_cdma), FALSE);
-
-	tmpl = nmc_fields_setting_cdma;
-	tmpl_len = sizeof (nmc_fields_setting_cdma);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_CDMA_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_cdma_get_number (setting, type));
-	set_val_str (arr, 2, nmc_property_cdma_get_username (setting, type));
-	set_val_str (arr, 3, GET_SECRET (secrets, setting, nmc_property_cdma_get_password, type));
-	set_val_str (arr, 4, nmc_property_cdma_get_password_flags (setting, type));
-	set_val_str (arr, 5, nmc_property_cdma_get_mtu (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_bluetooth_details (NMSetting *setting,
-                           NmCli *nmc,
-                           const char *one_prop,
-                           gboolean secrets,
-                           NmcPropertyGetType type)
-{
-	NMSettingBluetooth *s_bluetooth = NM_SETTING_BLUETOOTH (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_BLUETOOTH (s_bluetooth), FALSE);
-
-	tmpl = nmc_fields_setting_bluetooth;
-	tmpl_len = sizeof (nmc_fields_setting_bluetooth);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_BLUETOOTH_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_bluetooth_get_bdaddr (setting, type));
-	set_val_str (arr, 2, nmc_property_bluetooth_get_type (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_olpc_mesh_details (NMSetting *setting,
-                           NmCli *nmc,
-                           const char *one_prop,
-                           gboolean secrets,
-                           NmcPropertyGetType type)
-{
-	NMSettingOlpcMesh *s_olpc_mesh = NM_SETTING_OLPC_MESH (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_OLPC_MESH (s_olpc_mesh), FALSE);
-
-	tmpl = nmc_fields_setting_olpc_mesh;
-	tmpl_len = sizeof (nmc_fields_setting_olpc_mesh);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_OLPC_MESH_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_olpc_get_ssid (setting, type));
-	set_val_str (arr, 2, nmc_property_olpc_get_channel (setting, type));
-	set_val_str (arr, 3, nmc_property_olpc_get_anycast_address (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_vpn_details (NMSetting *setting,
-                     NmCli *nmc,
-                     const char *one_prop,
-                     gboolean secrets,
-                     NmcPropertyGetType type)
-{
-	NMSettingVpn *s_vpn = NM_SETTING_VPN (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_VPN (s_vpn), FALSE);
-
-	tmpl = nmc_fields_setting_vpn;
-	tmpl_len = sizeof (nmc_fields_setting_vpn);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_VPN_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_vpn_get_service_type (setting, type));
-	set_val_str (arr, 2, nmc_property_vpn_get_user_name (setting, type));
-	set_val_str (arr, 3, nmc_property_vpn_get_data (setting, type));
-	set_val_str (arr, 4, GET_SECRET (secrets, setting, nmc_property_vpn_get_secrets, type));
-	set_val_str (arr, 5, nmc_property_vpn_get_persistent (setting, type));
-	set_val_str (arr, 6, nmc_property_vpn_get_timeout (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_wimax_details (NMSetting *setting,
-                       NmCli *nmc,
-                       const char *one_prop,
-                       gboolean secrets,
-                       NmcPropertyGetType type)
-{
-	NMSettingWimax *s_wimax = NM_SETTING_WIMAX (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_WIMAX (s_wimax), FALSE);
-
-	tmpl = nmc_fields_setting_wimax;
-	tmpl_len = sizeof (nmc_fields_setting_wimax);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_WIMAX_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_wimax_get_mac_address (setting, type));
-	set_val_str (arr, 2, nmc_property_wimax_get_network_name (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_infiniband_details (NMSetting *setting,
-                            NmCli *nmc,
-                            const char *one_prop,
-                            gboolean secrets,
-                            NmcPropertyGetType type)
-{
-	NMSettingInfiniband *s_infiniband = NM_SETTING_INFINIBAND (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_INFINIBAND (s_infiniband), FALSE);
-
-	tmpl = nmc_fields_setting_infiniband;
-	tmpl_len = sizeof (nmc_fields_setting_infiniband);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_INFINIBAND_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_ib_get_mac_address (setting, type));
-	set_val_str (arr, 2, nmc_property_ib_get_mtu (setting, type));
-	set_val_str (arr, 3, nmc_property_ib_get_transport_mode (setting, type));
-	set_val_str (arr, 4, nmc_property_ib_get_p_key (setting, type));
-	set_val_str (arr, 5, nmc_property_ib_get_parent (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_bond_details (NMSetting *setting,
-                      NmCli *nmc,
-                      const char *one_prop,
-                      gboolean secrets,
-                      NmcPropertyGetType type)
-{
-	NMSettingBond *s_bond = NM_SETTING_BOND (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_BOND (s_bond), FALSE);
-
-	tmpl = nmc_fields_setting_bond;
-	tmpl_len = sizeof (nmc_fields_setting_bond);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_BOND_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_bond_get_options (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_vlan_details (NMSetting *setting,
-                      NmCli *nmc,
-                      const char *one_prop,
-                      gboolean secrets,
-                      NmcPropertyGetType type)
-{
-	NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_VLAN (s_vlan), FALSE);
-
-	tmpl = nmc_fields_setting_vlan;
-	tmpl_len = sizeof (nmc_fields_setting_vlan);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_VLAN_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_vlan_get_parent (setting, type));
-	set_val_str (arr, 2, nmc_property_vlan_get_id (setting, type));
-	set_val_str (arr, 3, nmc_property_vlan_get_flags (setting, type));
-	set_val_str (arr, 4, nmc_property_vlan_get_ingress_priority_map (setting, type));
-	set_val_str (arr, 5, nmc_property_vlan_get_egress_priority_map (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_adsl_details (NMSetting *setting,
-                      NmCli *nmc,
-                      const char *one_prop,
-                      gboolean secrets,
-                      NmcPropertyGetType type)
-{
-	NMSettingAdsl *s_adsl = NM_SETTING_ADSL (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_ADSL (s_adsl), FALSE);
-
-	tmpl = nmc_fields_setting_adsl;
-	tmpl_len = sizeof (nmc_fields_setting_adsl);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_ADSL_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_adsl_get_username (setting, type));
-	set_val_str (arr, 2, GET_SECRET (secrets, setting, nmc_property_adsl_get_password, type));
-	set_val_str (arr, 3, nmc_property_adsl_get_password_flags (setting, type));
-	set_val_str (arr, 4, nmc_property_adsl_get_protocol (setting, type));
-	set_val_str (arr, 5, nmc_property_adsl_get_encapsulation (setting, type));
-	set_val_str (arr, 6, nmc_property_adsl_get_vpi (setting, type));
-	set_val_str (arr, 7, nmc_property_adsl_get_vci (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_bridge_details (NMSetting *setting,
-                        NmCli *nmc,
-                        const char *one_prop,
-                        gboolean secrets,
-                        NmcPropertyGetType type)
-{
-	NMSettingBridge *s_bridge = NM_SETTING_BRIDGE (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_BRIDGE (s_bridge), FALSE);
-
-	tmpl = nmc_fields_setting_bridge;
-	tmpl_len = sizeof (nmc_fields_setting_bridge);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_BRIDGE_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_bridge_get_mac_address (setting, type));
-	set_val_str (arr, 2, nmc_property_bridge_get_stp (setting, type));
-	set_val_str (arr, 3, nmc_property_bridge_get_priority (setting, type));
-	set_val_str (arr, 4, nmc_property_bridge_get_forward_delay (setting, type));
-	set_val_str (arr, 5, nmc_property_bridge_get_hello_time (setting, type));
-	set_val_str (arr, 6, nmc_property_bridge_get_max_age (setting, type));
-	set_val_str (arr, 7, nmc_property_bridge_get_ageing_time (setting, type));
-	set_val_str (arr, 8, nmc_property_bridge_get_multicast_snooping (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_bridge_port_details (NMSetting *setting,
-                             NmCli *nmc,
-                             const char *one_prop,
-                             gboolean secrets,
-                             NmcPropertyGetType type)
-{
-	NMSettingBridgePort *s_bridge_port = NM_SETTING_BRIDGE_PORT (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_BRIDGE_PORT (s_bridge_port), FALSE);
-
-	tmpl = nmc_fields_setting_bridge_port;
-	tmpl_len = sizeof (nmc_fields_setting_bridge_port);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_BRIDGE_PORT_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_bridge_port_get_priority (setting, type));
-	set_val_str (arr, 2, nmc_property_bridge_port_get_path_cost (setting, type));
-	set_val_str (arr, 3, nmc_property_bridge_port_get_hairpin_mode (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_team_details (NMSetting *setting,
-                      NmCli *nmc,
-                      const char *one_prop,
-                      gboolean secrets,
-                      NmcPropertyGetType type)
-{
-	NMSettingTeam *s_team = NM_SETTING_TEAM (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_TEAM (s_team), FALSE);
-
-	tmpl = nmc_fields_setting_team;
-	tmpl_len = sizeof (nmc_fields_setting_team);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_TEAM_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_team_get_config (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_team_port_details (NMSetting *setting,
-                           NmCli *nmc,
-                           const char *one_prop,
-                           gboolean secrets,
-                           NmcPropertyGetType type)
-{
-	NMSettingTeamPort *s_team_port = NM_SETTING_TEAM_PORT (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_TEAM_PORT (s_team_port), FALSE);
-
-	tmpl = nmc_fields_setting_team_port;
-	tmpl_len = sizeof (nmc_fields_setting_team_port);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_TEAM_PORT_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_team_port_get_config (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_dcb_details (NMSetting *setting,
-                     NmCli *nmc,
-                     const char *one_prop,
-                     gboolean secrets,
-                     NmcPropertyGetType type)
-{
-	NMSettingDcb *s_dcb = NM_SETTING_DCB (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_DCB (s_dcb), FALSE);
-
-	tmpl = nmc_fields_setting_dcb;
-	tmpl_len = sizeof (nmc_fields_setting_dcb);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_DCB_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_dcb_get_app_fcoe_flags (setting, type));
-	set_val_str (arr, 2, nmc_property_dcb_get_app_fcoe_priority (setting, type));
-	set_val_str (arr, 3, nmc_property_dcb_get_app_fcoe_mode (setting, type));
-	set_val_str (arr, 4, nmc_property_dcb_get_app_iscsi_flags (setting, type));
-	set_val_str (arr, 5, nmc_property_dcb_get_app_iscsi_priority (setting, type));
-	set_val_str (arr, 6, nmc_property_dcb_get_app_fip_flags (setting, type));
-	set_val_str (arr, 7, nmc_property_dcb_get_app_fip_priority (setting, type));
-	set_val_str (arr, 8, nmc_property_dcb_get_pfc_flags (setting, type));
-	set_val_str (arr, 9, nmc_property_dcb_get_pfc (setting, type));
-	set_val_str (arr, 10, nmc_property_dcb_get_pg_flags (setting, type));
-	set_val_str (arr, 11, nmc_property_dcb_get_pg_group_id (setting, type));
-	set_val_str (arr, 12, nmc_property_dcb_get_pg_group_bandwidth (setting, type));
-	set_val_str (arr, 13, nmc_property_dcb_get_pg_bandwidth (setting, type));
-	set_val_str (arr, 14, nmc_property_dcb_get_pg_strict (setting, type));
-	set_val_str (arr, 15, nmc_property_dcb_get_pg_traffic_class (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_tun_details (NMSetting *setting,
-                     NmCli *nmc,
-                     const char *one_prop,
-                     gboolean secrets,
-                     NmcPropertyGetType type)
-{
-	NMSettingTun *s_tun = NM_SETTING_TUN (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_TUN (s_tun), FALSE);
-
-	tmpl = nmc_fields_setting_tun;
-	tmpl_len = sizeof (nmc_fields_setting_tun);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_TUN_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_tun_get_mode (setting, type));
-	set_val_str (arr, 2, nmc_property_tun_get_owner (setting, type));
-	set_val_str (arr, 3, nmc_property_tun_get_group (setting, type));
-	set_val_str (arr, 4, nmc_property_tun_get_pi (setting, type));
-	set_val_str (arr, 5, nmc_property_tun_get_vnet_hdr (setting, type));
-	set_val_str (arr, 6, nmc_property_tun_get_multi_queue (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_ip_tunnel_details (NMSetting *setting,
-                           NmCli *nmc,
-                           const char *one_prop,
-                           gboolean secrets,
-                           NmcPropertyGetType type)
-{
-	NMSettingIPTunnel *s_ip_tunnel = NM_SETTING_IP_TUNNEL (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_IP_TUNNEL (s_ip_tunnel), FALSE);
-
-	tmpl = nmc_fields_setting_ip_tunnel;
-	tmpl_len = sizeof (nmc_fields_setting_ip_tunnel);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_IP_TUNNEL_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_ip_tunnel_get_mode (setting, type));
-	set_val_str (arr, 2, nmc_property_ip_tunnel_get_parent (setting, type));
-	set_val_str (arr, 3, nmc_property_ip_tunnel_get_local (setting, type));
-	set_val_str (arr, 4, nmc_property_ip_tunnel_get_remote (setting, type));
-	set_val_str (arr, 5, nmc_property_ip_tunnel_get_ttl (setting, type));
-	set_val_str (arr, 6, nmc_property_ip_tunnel_get_tos (setting, type));
-	set_val_str (arr, 7, nmc_property_ip_tunnel_get_path_mtu_discovery (setting, type));
-	set_val_str (arr, 8, nmc_property_ip_tunnel_get_input_key (setting, type));
-	set_val_str (arr, 9, nmc_property_ip_tunnel_get_output_key (setting, type));
-	set_val_str (arr, 10, nmc_property_ip_tunnel_get_encapsulation_limit (setting, type));
-	set_val_str (arr, 11, nmc_property_ip_tunnel_get_flow_label (setting, type));
-	set_val_str (arr, 12, nmc_property_ip_tunnel_get_mtu (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_macsec_details (NMSetting *setting,
-                        NmCli *nmc,
-                        const char *one_prop,
-                        gboolean secrets,
-                        NmcPropertyGetType type)
-{
-	NMSettingMacsec *s_macsec = NM_SETTING_MACSEC (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_MACSEC (s_macsec), FALSE);
-
-	tmpl = nmc_fields_setting_macsec;
-	tmpl_len = sizeof (nmc_fields_setting_macsec);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_MACSEC_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_macsec_get_parent (setting, type));
-	set_val_str (arr, 2, nmc_property_macsec_get_mode (setting, type));
-	set_val_str (arr, 3, nmc_property_macsec_get_encrypt (setting, type));
-	set_val_str (arr, 4, GET_SECRET (secrets, setting, nmc_property_macsec_get_mka_cak, type));
-	set_val_str (arr, 5, nmc_property_macsec_get_mka_cak_flags (setting, type));
-	set_val_str (arr, 6, nmc_property_macsec_get_mka_ckn (setting, type));
-	set_val_str (arr, 7, nmc_property_macsec_get_port (setting, type));
-	set_val_str (arr, 8, nmc_property_macsec_get_validation (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_macvlan_details (NMSetting *setting,
-                         NmCli *nmc,
-                         const char *one_prop,
-                         gboolean secrets,
-                         NmcPropertyGetType type)
-{
-	NMSettingMacvlan *s_macvlan = NM_SETTING_MACVLAN (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_MACVLAN (s_macvlan), FALSE);
-
-	tmpl = nmc_fields_setting_macvlan;
-	tmpl_len = sizeof (nmc_fields_setting_macvlan);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_MACVLAN_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_macvlan_get_parent (setting, type));
-	set_val_str (arr, 2, nmc_property_macvlan_get_mode (setting, type));
-	set_val_str (arr, 3, nmc_property_macvlan_get_promiscuous (setting, type));
-	set_val_str (arr, 4, nmc_property_macvlan_get_tap (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_vxlan_details (NMSetting *setting,
-                       NmCli *nmc,
-                       const char *one_prop,
-                       gboolean secrets,
-                       NmcPropertyGetType type)
-{
-	NMSettingVxlan *s_vxlan = NM_SETTING_VXLAN (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_VXLAN (s_vxlan), FALSE);
-
-	tmpl = nmc_fields_setting_vxlan;
-	tmpl_len = sizeof (nmc_fields_setting_vxlan);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_VXLAN_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_vxlan_get_parent (setting, type));
-	set_val_str (arr, 2, nmc_property_vxlan_get_id (setting, type));
-	set_val_str (arr, 3, nmc_property_vxlan_get_local (setting, type));
-	set_val_str (arr, 4, nmc_property_vxlan_get_remote (setting, type));
-	set_val_str (arr, 5, nmc_property_vxlan_get_source_port_min (setting, type));
-	set_val_str (arr, 6, nmc_property_vxlan_get_source_port_max (setting, type));
-	set_val_str (arr, 7, nmc_property_vxlan_get_destination_port (setting, type));
-	set_val_str (arr, 8, nmc_property_vxlan_get_tos (setting, type));
-	set_val_str (arr, 9, nmc_property_vxlan_get_ttl (setting, type));
-	set_val_str (arr, 10, nmc_property_vxlan_get_ageing (setting, type));
-	set_val_str (arr, 11, nmc_property_vxlan_get_limit (setting, type));
-	set_val_str (arr, 12, nmc_property_vxlan_get_learning (setting, type));
-	set_val_str (arr, 13, nmc_property_vxlan_get_proxy (setting, type));
-	set_val_str (arr, 14, nmc_property_vxlan_get_rsc (setting, type));
-	set_val_str (arr, 15, nmc_property_vxlan_get_l2_miss (setting, type));
-	set_val_str (arr, 16, nmc_property_vxlan_get_l3_miss (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-static gboolean
-setting_proxy_details (NMSetting *setting,
-                       NmCli *nmc,
-                       const char *one_prop,
-                       gboolean secrets,
-                       NmcPropertyGetType type)
-{
-	NMSettingProxy *s_proxy = NM_SETTING_PROXY (setting);
-	NmcOutputField *tmpl, *arr;
-	size_t tmpl_len;
-
-	g_return_val_if_fail (NM_IS_SETTING_PROXY (s_proxy), FALSE);
-
-	tmpl = nmc_fields_setting_proxy;
-	tmpl_len = sizeof (nmc_fields_setting_proxy);
-	nmc->print_fields.indices = parse_output_fields (one_prop ? one_prop : NMC_FIELDS_SETTING_PROXY_ALL,
-	                                                 tmpl, FALSE, NULL, NULL);
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
-	g_ptr_array_add (nmc->output_data, arr);
-
-	arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
-	set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting)));
-	set_val_str (arr, 1, nmc_property_proxy_get_method (setting, type));
-	set_val_str (arr, 2, nmc_property_proxy_get_browser_only (setting, type));
-	set_val_str (arr, 3, nmc_property_proxy_get_pac_url (setting, type));
-	set_val_str (arr, 4, nmc_property_proxy_get_pac_script (setting, type));
-	g_ptr_array_add (nmc->output_data, arr);
-
-	print_data (nmc);  /* Print all data */
-
-	return TRUE;
-}
-
-typedef struct {
-	const char *sname;
-	gboolean (*func) (NMSetting *setting,
-	                  NmCli *nmc,
-	                  const char *one_prop,
-	                  gboolean secrets,
-	                  NmcPropertyGetType type);
-} SettingDetails;
-
-static const SettingDetails detail_printers[] = {
-	{ NM_SETTING_CONNECTION_SETTING_NAME,        setting_connection_details },
-	{ NM_SETTING_WIRED_SETTING_NAME,             setting_wired_details },
-	{ NM_SETTING_802_1X_SETTING_NAME,            setting_802_1X_details },
-	{ NM_SETTING_WIRELESS_SETTING_NAME,          setting_wireless_details },
-	{ NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, setting_wireless_security_details },
-	{ NM_SETTING_IP4_CONFIG_SETTING_NAME,        setting_ip4_config_details },
-	{ NM_SETTING_IP6_CONFIG_SETTING_NAME,        setting_ip6_config_details },
-	{ NM_SETTING_SERIAL_SETTING_NAME,            setting_serial_details },
-	{ NM_SETTING_PPP_SETTING_NAME,               setting_ppp_details },
-	{ NM_SETTING_PPPOE_SETTING_NAME,             setting_pppoe_details },
-	{ NM_SETTING_GSM_SETTING_NAME,               setting_gsm_details },
-	{ NM_SETTING_CDMA_SETTING_NAME,              setting_cdma_details },
-	{ NM_SETTING_BLUETOOTH_SETTING_NAME,         setting_bluetooth_details },
-	{ NM_SETTING_OLPC_MESH_SETTING_NAME,         setting_olpc_mesh_details },
-	{ NM_SETTING_VPN_SETTING_NAME,               setting_vpn_details },
-	{ NM_SETTING_WIMAX_SETTING_NAME,             setting_wimax_details },
-	{ NM_SETTING_INFINIBAND_SETTING_NAME,        setting_infiniband_details },
-	{ NM_SETTING_BOND_SETTING_NAME,              setting_bond_details },
-	{ NM_SETTING_VLAN_SETTING_NAME,              setting_vlan_details },
-	{ NM_SETTING_ADSL_SETTING_NAME,              setting_adsl_details },
-	{ NM_SETTING_BRIDGE_SETTING_NAME,            setting_bridge_details },
-	{ NM_SETTING_BRIDGE_PORT_SETTING_NAME,       setting_bridge_port_details },
-	{ NM_SETTING_TEAM_SETTING_NAME,              setting_team_details },
-	{ NM_SETTING_TEAM_PORT_SETTING_NAME,         setting_team_port_details },
-	{ NM_SETTING_DCB_SETTING_NAME,               setting_dcb_details },
-	{ NM_SETTING_TUN_SETTING_NAME,               setting_tun_details },
-	{ NM_SETTING_IP_TUNNEL_SETTING_NAME,         setting_ip_tunnel_details },
-	{ NM_SETTING_MACSEC_SETTING_NAME,            setting_macsec_details },
-	{ NM_SETTING_MACVLAN_SETTING_NAME,           setting_macvlan_details },
-	{ NM_SETTING_VXLAN_SETTING_NAME,             setting_vxlan_details },
-	{ NM_SETTING_PROXY_SETTING_NAME,             setting_proxy_details },
-	{ NULL },
-};
+/*****************************************************************************/
 
 gboolean
-setting_details (NMSetting *setting, NmCli *nmc,  const char *one_prop, gboolean secrets)
+setting_details (const NmcConfig *nmc_config, NMSetting *setting, const char *one_prop)
 {
-	const SettingDetails *iter = &detail_printers[0];
-	NmcPropertyGetType type = NMC_PROPERTY_GET_PRETTY;
+	const NMMetaSettingInfoEditor *setting_info;
+	gs_free_error GError *error = NULL;
+	gs_free char *fields_str = NULL;
 
 	g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
 
-	if (nmc->print_output == NMC_PRINT_TERSE)
-		type = NMC_PROPERTY_GET_PARSABLE;
+	setting_info = nm_meta_setting_info_editor_find_by_setting (setting);
+	if (!setting_info)
+		return FALSE;
 
-	while (iter->sname) {
-		if (nm_setting_lookup_type (iter->sname) == G_OBJECT_TYPE (setting))
-			return iter->func (setting, nmc, one_prop, secrets, type);
-		iter++;
+	if (one_prop) {
+		/* hack around setting-details being called for one setting. Must prefix the
+		 * property name with the setting name. Later we should remove setting_details()
+		 * and merge it into the caller. */
+		fields_str = g_strdup_printf ("%s.%s", nm_setting_get_name (setting), one_prop);
 	}
 
-	g_assert_not_reached ();
-	return FALSE;
-}
+	if (!nmc_print (nmc_config,
+	                (gpointer[]) { setting, NULL },
+	                NULL,
+	                (const NMMetaAbstractInfo *const[]) { (const NMMetaAbstractInfo *) setting_info, NULL },
+	                fields_str,
+	                &error))
+		return FALSE;
 
+	return TRUE;
+}