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

nmcli: merge branch 'th/nmcli-import-wg-dnssearch'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/832
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1005
This commit is contained in:
Beniamino Galvani 2021-11-02 10:17:05 +01:00
commit afe0dedc7c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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.