New upstream version 1.22.8 upstream/1.22.8

1 files changed, 26 insertions, 33 deletions

diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 8e05c9bc..d9ccada9 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -2089,8 +2089,6 @@ _set_fcn_gobject_ifname (ARGS_SET_FCN)
 	if (_SET_FCN_DO_RESET_DEFAULT (property_info, modifier, value))
 		return _gobject_property_reset_default (setting, property_info->property_name);
 
-	if (!nm_utils_is_valid_iface_name (value, error))
-		return FALSE;
 	g_object_set (setting, property_info->property_name, value, NULL);
 	return TRUE;
 }
@@ -2567,24 +2565,6 @@ _multilist_remove_by_value_fcn_connection_permissions (NMSetting *setting,
 	return TRUE;
 }
 
-static gboolean
-_set_fcn_connection_master (ARGS_SET_FCN)
-{
-	if (_SET_FCN_DO_RESET_DEFAULT (property_info, modifier, value))
-		value = NULL;
-	else if (!*value)
-		value = NULL;
-	else if (   !nm_utils_is_valid_iface_name (value, NULL)
-	         && !nm_utils_is_uuid (value)) {
-		g_set_error (error, 1, 0,
-		             _("'%s' is not valid master; use ifname or connection UUID"),
-		             value);
-		return FALSE;
-	}
-	g_object_set (setting, property_info->property_name, value, NULL);
-	return TRUE;
-}
-
 static const char *const*
 _complete_fcn_connection_master (ARGS_COMPLETE_FCN)
 {
@@ -4487,6 +4467,22 @@ static const NMMetaPropertyType _pt_objlist = {
         ), \
     ),
 
+static const NMMetaPropertyTypData _ptd_gobject_int_timeout = {
+    PROPERTY_TYP_DATA_SUBTYPE (
+        gobject_int,
+        .value_infos = INT_VALUE_INFOS (
+            {
+                .value.i64 = 0,
+                .nick = "default",
+            },
+            {
+                .value.i64 = G_MAXINT32,
+                .nick = "infinity",
+            },
+        ),
+    ),
+};
+
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_6LOWPAN
 static const NMMetaPropertyInfo *const property_infos_6LOWPAN[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_6LOWPAN_PARENT,
@@ -5113,7 +5109,7 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
 	    .prompt =                       NM_META_TEXT_PROMPT_MASTER,
 	    .property_type = DEFINE_PROPERTY_TYPE (
 	        .get_fcn =                  _get_fcn_gobject,
-	        .set_fcn =                  _set_fcn_connection_master,
+	        .set_fcn =                  _set_fcn_gobject_string,
 	        .complete_fcn =             _complete_fcn_connection_master,
 	    ),
 	),
@@ -5644,18 +5640,7 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = {
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT,
 	    .property_type =                &_pt_gobject_int,
-	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-	        .value_infos =              INT_VALUE_INFOS (
-	            {
-	                .value.i64 = 0,
-	                .nick = "default",
-	            },
-	            {
-	                .value.i64 = G_MAXINT32,
-	                .nick = "infinity",
-	            },
-	        ),
-	    ),
+	    .property_typ_data =            &_ptd_gobject_int_timeout,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME,
 	    .property_type =                &_pt_gobject_bool,
@@ -5892,12 +5877,20 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = {
 	                                    | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
 	    ),
 	),
+	PROPERTY_INFO (NM_SETTING_IP6_CONFIG_RA_TIMEOUT, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_RA_TIMEOUT,
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data =            &_ptd_gobject_int_timeout,
+	),
 	PROPERTY_INFO (NM_SETTING_IP6_CONFIG_DHCP_DUID, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID,
 	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_IAID, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_IAID,
 	    .property_type =                &_pt_gobject_string,
 	),
+	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_TIMEOUT,
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data =            &_ptd_gobject_int_timeout,
+	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME,
 	    .property_type =                &_pt_gobject_bool,
 	),