supplicant: honor the domain-suffix-match properties

diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c
index 091742e..67bba58 100644 (file)
--- a/src/supplicant-manager/nm-supplicant-config.c
+++ b/src/supplicant-manager/nm-supplicant-config.c
@@ -1033,6 +1033,14 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
        if (!ADD_STRING_LIST_VAL (self, setting, 802_1x, phase2_altsubject_match, phase2_altsubject_matches, "altsubject_match2", ';', FALSE, FALSE, error))
                return FALSE;
 
+       /* Domain suffix match */
+       value = nm_setting_802_1x_get_domain_suffix_match (setting);
+       if (!add_string_val (self, value, "domain_suffix_match", FALSE, FALSE, error))
+               return FALSE;
+       value = nm_setting_802_1x_get_phase2_domain_suffix_match (setting);
+       if (!add_string_val (self, value, "domain_suffix_match2", FALSE, FALSE, error))
+               return FALSE;
+
        /* Private key */
        added = FALSE;
        switch (nm_setting_802_1x_get_private_key_scheme (setting)) {

diff --git a/src/supplicant-manager/nm-supplicant-settings-verify.c b/src/supplicant-manager/nm-supplicant-settings-verify.c
index ec660d1..bb046f9 100644 (file)
--- a/src/supplicant-manager/nm-supplicant-settings-verify.c
+++ b/src/supplicant-manager/nm-supplicant-settings-verify.c
@@ -112,6 +112,7 @@ static const struct Opt opt_table[] = {
        { "ca_path",            TYPE_BYTES,   0, 0, FALSE,  NULL },
        { "subject_match",      TYPE_BYTES,   0, 0, FALSE,  NULL },
        { "altsubject_match",   TYPE_BYTES,   0, 0, FALSE,  NULL },
+       { "domain_suffix_match",TYPE_BYTES,   0, 0, FALSE,  NULL },
        { "ca_cert",            TYPE_BYTES,   0, 65536, FALSE,  NULL },
        { "client_cert",        TYPE_BYTES,   0, 65536, FALSE,  NULL },
        { "private_key",        TYPE_BYTES,   0, 65536, FALSE,  NULL },
@@ -122,6 +123,7 @@ static const struct Opt opt_table[] = {
        { "ca_path2",           TYPE_BYTES,   0, 0, FALSE,  NULL },
        { "subject_match2",     TYPE_BYTES,   0, 0, FALSE,  NULL },
        { "altsubject_match2",  TYPE_BYTES,   0, 0, FALSE,  NULL },
+       { "domain_suffix_match2", TYPE_BYTES, 0, 0, FALSE,  NULL },
        { "ca_cert2",           TYPE_BYTES,   0, 65536, FALSE,  NULL },
        { "client_cert2",       TYPE_BYTES,   0, 65536, FALSE,  NULL },
        { "private_key2",       TYPE_BYTES,   0, 65536, FALSE,  NULL },