diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-09-02 13:15:06 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-09-02 13:18:22 +0200 |
| commit | 576a1289546d0bc03e543ee33aa9529145365e1a (patch) | |
| tree | 3bf4162b5bcae5921c3d34a516b843afb3f6bfc6 | |
| parent | 6cf28fe2c0b1969a785c687bc3646d60cfce49e1 (diff) | |
| download | NetworkManager-576a1289546d0bc03e543ee33aa9529145365e1a.tar.gz | |
keyfile: reorder printing empty [wireguard] section with peers and fix test failure
We want to print the [wireguard] section before printing sections of the
peers. It just looks nicer.
This also fixes a test failure:
/libnm/settings/roundtrip-conversion/wireguard/2: **
test:ERROR:./shared/nm-utils/nm-test-utils.h:2254:nmtst_keyfile_assert_data: assertion failed (d1 == data): ("[connection]\nid=roundtrip-conversion-2\nuuid=63376701-b61e-4318-bf7e-664a1c1eeaab\ntype=wireguard\ninterface-name=ifname2\npermissions=\n\n[wireguard-peer.uoGoXWWRxJvu4jDva8pPGA4nxau8B33S+YR+MfPFjxc=]\nendpoint=192.168.255.180:30429\npreshared-key-flags=2\n\n[wireguard-peer.BED73rH9j3OCHYAeXNrW5y5oia/Ngj+M04e9sG7DQOo=]\nendpoint=192.168.188.253:30407\npreshared-key-flags=1\npersistent-keepalive=5070\nallowed-ips=192.168.215.179/32;192.168.120.249/32;a:b:c::e4:13/128;192.168.157.84/32;a:b:c::1b:df/128;a:b:c::b0:84/128;192.168.168.17/32;\n\n[wireguard]\n\n[ipv4]\ndns-search=\nmethod=disabled\n\n[ipv6]\naddr-gen-mode=stable-privacy\ndns-search=\nmethod=ignore\n\n[proxy]\n" == "[connection]\nid=roundtrip-conversion-2\nuuid=63376701-b61e-4318-bf7e-664a1c1eeaab\ntype=wireguard\ninterface-name=ifname2\npermissions=\n\n[wireguard]\n\n[wireguard-peer.uoGoXWWRxJvu4jDva8pPGA4nxau8B33S+YR+MfPFjxc=]\nendpoint=192.168.255.180:30429\npreshared-key-flags=2\n\n[wireguard-peer.BED73rH9j3OCHYAeXNrW5y5oia/Ngj+M04e9sG7DQOo=]\nendpoint=192.168.188.253:30407\npreshared-key-flags=1\npersistent-keepalive=5070\nallowed-ips=192.168.215.179/32;192.168.120.249/32;a:b:c::e4:13/128;192.168.157.84/32;a:b:c::1b:df/128;a:b:c::b0:84/128;192.168.168.17/32;\n\n[ipv4]\ndns-search=\nmethod=disabled\n\n[ipv6]\naddr-gen-mode=stable-privacy\ndns-search=\nmethod=ignore\n\n[proxy]\n")
Fixes: ddd148e02b6b ('keyfile: let keyfile writer serialize setting with all default values')
| -rw-r--r-- | libnm-core/nm-keyfile.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libnm-core/nm-keyfile.c b/libnm-core/nm-keyfile.c index d2360f8c2a..675b32c5e2 100644 --- a/libnm-core/nm-keyfile.c +++ b/libnm-core/nm-keyfile.c @@ -3924,12 +3924,6 @@ nm_keyfile_write (NMConnection *connection, goto out_with_info_error; } - if (NM_IS_SETTING_WIREGUARD (setting)) { - _write_setting_wireguard (setting, &info); - if (info.error) - goto out_with_info_error; - } - setting_alias = nm_keyfile_plugin_get_alias_for_setting_name (setting_name); if ( ( setting_alias && g_key_file_has_group (info.keyfile, setting_alias)) @@ -3942,6 +3936,12 @@ nm_keyfile_write (NMConnection *connection, g_key_file_remove_key (info.keyfile, setting_alias ?: setting_name, ".X", NULL); } + if (NM_IS_SETTING_WIREGUARD (setting)) { + _write_setting_wireguard (setting, &info); + if (info.error) + goto out_with_info_error; + } + nm_assert (!info.error); } |