diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-06-23 18:07:21 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-06-23 18:07:21 +0200 |
| commit | 39143df7aed46e83f8c68ea9ad6d24cfdf5a1dd8 (patch) | |
| tree | d04e604dc48369096d672ed8e02449c903bb986e /shared/nm-keyfile | |
| parent | 96642ebde58e1eea692aea6a92d33f45452fa9c0 (diff) | |
| parent | 45e8e1149027529194982212c804c0468aa01d98 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'shared/nm-keyfile')
| -rw-r--r-- | shared/nm-keyfile/nm-keyfile.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/shared/nm-keyfile/nm-keyfile.c b/shared/nm-keyfile/nm-keyfile.c index 879b1b00..00a61d03 100644 --- a/shared/nm-keyfile/nm-keyfile.c +++ b/shared/nm-keyfile/nm-keyfile.c @@ -3535,7 +3535,8 @@ nm_keyfile_read (GKeyFile *keyfile, vpn_secrets = TRUE; } else if (NM_STR_HAS_PREFIX (groups[i], NM_KEYFILE_GROUPPREFIX_WIREGUARD_PEER)) _read_setting_wireguard_peer (&info); - else if (nm_streq (groups[i], NM_KEYFILE_GROUP_NMMETA)) { + else if (NM_IN_STRSET (groups[i], NM_KEYFILE_GROUP_NMMETA, + ETHERNET_S390_OPTIONS_GROUP_NAME)) { /* pass */ } else _read_setting (&info); |