diff options
| author | Michael Biebl <biebl@debian.org> | 2022-03-07 21:31:48 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-03-07 21:31:48 +0100 |
| commit | b002c8cf4a4edaf7067563fc1d59545b5c88cc99 (patch) | |
| tree | 6818612f86964c1dd79bb373feb4f443eeb2dd69 /src/core/dhcp | |
| parent | a31332e76bee4c5977e2ef9daeeddb205bad27ea (diff) | |
| parent | 4f887bccf1cde84106588536584a2d54a5b4e6e5 (diff) | |
Update upstream source from tag 'upstream/1.36.2'
Update to upstream version '1.36.2' with Debian dir ababed5cf88a964e7aac789b48238ba3cf57f0b4
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); |