diff options
| author | Michael Biebl <biebl@debian.org> | 2022-08-12 19:27:49 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-08-12 19:27:49 +0200 |
| commit | 3237c6678bee0411e44b2d2055fb16c2f86da218 (patch) | |
| tree | e3d8a0dab846c99fa6132c945ec3bbd59b1cc170 /src/core/dhcp/nm-dhcp-utils.c | |
| parent | b020a0dc29267ec099f631e93f214a0d3549ba40 (diff) | |
| parent | 6accbd3ec0e42d8633bbde4d47ed7bfe854e7e0b (diff) | |
Update upstream source from tag 'upstream/1.38.4'
Update to upstream version '1.38.4' with Debian dir 24b65b102e62687c29d90ce76c47d939b35b96ad
Diffstat (limited to 'src/core/dhcp/nm-dhcp-utils.c')
| -rw-r--r-- | src/core/dhcp/nm-dhcp-utils.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/dhcp/nm-dhcp-utils.c b/src/core/dhcp/nm-dhcp-utils.c index 081e2841..88fe83f3 100644 --- a/src/core/dhcp/nm-dhcp-utils.c +++ b/src/core/dhcp/nm-dhcp-utils.c @@ -855,8 +855,7 @@ nm_dhcp_utils_merge_new_dhcp6_lease(const NML3ConfigData *l3cd_old, const char *start; const char *iaid; - nm_assert(out_l3cd_merged); - nm_assert(!*out_l3cd_merged); + nm_assert(out_l3cd_merged && !*out_l3cd_merged); if (!l3cd_old) return FALSE; |