colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm-core: nm-setting-8021x: treat some empty properties as NULL

Browse Source 
For some properties as *subject-match and *domain-suffix-match an
empty string means that we don't want to do any filtering and should
be stored as NULL.
This commit is contained in:
Beniamino Galvani
2016-03-08 15:22:05 +01:00
parent 2f45aaa55f
commit 46f8045c9e
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libnm-core/nm-setting-8021x.c
View File

@@ -2915,6 +2915,15 @@ set_cert_prop_helper (const GValue *value, const char *prop_name, GError **error
return bytes;
}
static char *
_g_value_dup_string_not_empty (const GValue *value)
{
const gchar *str;
str = g_value_get_string (value);
return str && str[0] ? g_strdup (str) : NULL;
}
static void
set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec)
@@ -2955,7 +2964,7 @@ set_property (GObject *object, guint prop_id,
break;
case PROP_SUBJECT_MATCH:
g_free (priv->subject_match);
priv->subject_match = g_value_dup_string (value);
priv->subject_match = _g_value_dup_string_not_empty (value);
break;
case PROP_ALTSUBJECT_MATCHES:
g_slist_free_full (priv->altsubject_matches, g_free);
@@ -2963,7 +2972,7 @@ set_property (GObject *object, guint prop_id,
break;
case PROP_DOMAIN_SUFFIX_MATCH:
g_free (priv->domain_suffix_match);
priv->domain_suffix_match = g_value_dup_string (value);
priv->domain_suffix_match = _g_value_dup_string_not_empty (value);
break;
case PROP_CLIENT_CERT:
if (priv->client_cert)
@@ -3009,7 +3018,7 @@ set_property (GObject *object, guint prop_id,
break;
case PROP_PHASE2_SUBJECT_MATCH:
g_free (priv->phase2_subject_match);
priv->phase2_subject_match = g_value_dup_string (value);
priv->phase2_subject_match = _g_value_dup_string_not_empty (value);
break;
case PROP_PHASE2_ALTSUBJECT_MATCHES:
g_slist_free_full (priv->phase2_altsubject_matches, g_free);
@@ -3017,7 +3026,7 @@ set_property (GObject *object, guint prop_id,
break;
case PROP_PHASE2_DOMAIN_SUFFIX_MATCH:
g_free (priv->phase2_domain_suffix_match);
priv->phase2_domain_suffix_match = g_value_dup_string (value);
priv->phase2_domain_suffix_match = _g_value_dup_string_not_empty (value);
break;
case PROP_PHASE2_CLIENT_CERT:
if (priv->phase2_client_cert)