fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-03 00:00:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli/wireguard: merge branch 'mcatanzaro/wg-import-dns-priority'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/901
This commit is contained in:
Thomas Haller 2021-06-23 20:33:51 +02:00
commit 75f69ae3da
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
NEWS
View file

@ -8,6 +8,11 @@ subject to change and not guaranteed to be compatible with
the later release.
USE AT YOUR OWN RISK. NOT RECOMMENDED FOR PRODUCTION USE!
* wireguard: importing wg-quick configuration files with nmcli
no longer sets a negative, exclusive "dns-priority". This plays
better with common split DNS setups that use systemd-resolved.
Adjust the "dns-priority" to your liking after import yourself.
=============================================
NetworkManager-1.32
Overview of changes since NetworkManager-1.30

5
src/libnmc-base/nm-vpn-helpers.c
View file

@ -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]);