diff options
Diffstat (limited to 'src/libnmc-base/nm-vpn-helpers.c')
| -rw-r--r-- | src/libnmc-base/nm-vpn-helpers.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c index 72691e34..99a69276 100644 --- a/src/libnmc-base/nm-vpn-helpers.c +++ b/src/libnmc-base/nm-vpn-helpers.c @@ -236,7 +236,7 @@ nm_vpn_openconnect_authenticate_helper(const char *host, * HOST='1.2.3.4' * FINGERPRINT='sha1:32bac90cf09a722e10ecc1942c67fe2ac8c21e2e' */ - output_v = nm_utils_strsplit_set_with_empty(output, "\r\n"); + output_v = nm_strsplit_set_with_empty(output, "\r\n"); for (iter = output_v; iter && *iter; iter++) { char *s_mutable = (char *) *iter; @@ -746,7 +746,7 @@ fail_invalid_secret: GPtrArray * data_addr = is_v4 ? data_addr_v4 : data_addr_v6; GPtrArray * data_dns_search2 = data_dns_search; - if (data_dns && !data_addr) { + if (!data_addr) { /* When specifying "DNS", we also require an "Address" for the same address * family. That is because a NMSettingIPConfig cannot have @method_disabled * and DNS settings at the same time. @@ -761,11 +761,6 @@ fail_invalid_secret: data_addr ? method_manual : method_disabled, NULL); - /* For WireGuard profiles, always set dns-priority to a negative value, - * so that DNS servers on other profiles get ignored. This is also what - * wg-quick does, by calling `resolvconf -x`. */ - g_object_set(s_ip, NM_SETTING_IP_CONFIG_DNS_PRIORITY, (int) -50, NULL); - if (data_addr) { for (i = 0; i < data_addr->len; i++) nm_setting_ip_config_add_address(s_ip, data_addr->pdata[i]); |