diff options
| author | Michael Biebl <biebl@debian.org> | 2022-03-07 21:30:42 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-03-07 21:30:42 +0100 |
| commit | 4f887bccf1cde84106588536584a2d54a5b4e6e5 (patch) | |
| tree | 454b1e2f3097b494dd9a4535815f382f214abf98 /src/core/dhcp | |
| parent | 4e966a21b9ef4fb910a5bd1a5699d404a65cfe55 (diff) | |
New upstream version 1.36.2 upstream/1.36.2
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); |