diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-03-08 14:36:58 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-03-08 14:36:58 -0500 |
| commit | 53010f05df012183a1f9d9e7ca684b5fe722563d (patch) | |
| tree | e1e0cc839b8517d9392787d79bf4265a5e6f9b33 /src/core/dhcp | |
| parent | 9a04f21da9a5ab80d69c0d2832360d82c471916c (diff) | |
| parent | 0514770b02f34ccb56b6bc52010452663c6717ed (diff) | |
Merge tag 'debian/1.36.2-1' into ubuntu/master
network-manager Debian release 1.36.2-1
Diffstat (limited to 'src/core/dhcp')
| -rw-r--r-- | src/core/dhcp/nm-dhcp-utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/dhcp/nm-dhcp-utils.c b/src/core/dhcp/nm-dhcp-utils.c index 4a138086..214e94cd 100644 --- a/src/core/dhcp/nm-dhcp-utils.c +++ b/src/core/dhcp/nm-dhcp-utils.c @@ -876,7 +876,7 @@ nm_dhcp_utils_merge_new_dhcp6_lease(const NML3ConfigData *l3cd_old, * addresses from the same transaction into a single configuration. **/ - l3cd_merged = nm_l3_config_data_new_clone(l3cd_old, -1); + l3cd_merged = nm_l3_config_data_new_clone(l3cd_old, 0); nm_l3_config_data_iter_ip6_address_for_each (&iter, l3cd_new, &addr) nm_l3_config_data_add_address_6(l3cd_merged, addr); |