diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2016-03-08 15:22:05 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2016-03-16 17:32:17 +0100 |
| commit | 46f8045c9e68bc341ad0d1c1587974995be8a92e (patch) | |
| tree | 64b8c93f7a7128d62e377255f53c42994a981266 /libnm-core | |
| parent | 2f45aaa55f4661057015f90d08c36f28b8c4ae13 (diff) | |
| download | NetworkManager-46f8045c9e68bc341ad0d1c1587974995be8a92e.tar.gz | |
libnm-core: nm-setting-8021x: treat some empty properties as NULL
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.
Diffstat (limited to 'libnm-core')
| -rw-r--r-- | libnm-core/nm-setting-8021x.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index 06c3d55920..4db420de05 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -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) |