diff options
| author | Michael Biebl <biebl@debian.org> | 2020-02-19 23:32:13 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-02-19 23:32:13 +0100 |
| commit | 3c2c324f025086dfdd40e2ec9f6db0643625c1de (patch) | |
| tree | 4efeae8faed34c747189f71b1129d67c3fe8bbf4 /src/dhcp/nm-dhcp-client.c | |
| parent | bc4ff7bc667094c9450d8a34abe552886c4b1f73 (diff) | |
| parent | e536d40eaea5dcdc0743b0a5e8e17faa46608a50 (diff) | |
Update upstream source from tag 'upstream/1.22.8'
Update to upstream version '1.22.8' with Debian dir 692c834c9a0433e17bbad56345902291f4c31d2a
Diffstat (limited to 'src/dhcp/nm-dhcp-client.c')
| -rw-r--r-- | src/dhcp/nm-dhcp-client.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c index faac18e0..81c4ad9c 100644 --- a/src/dhcp/nm-dhcp-client.c +++ b/src/dhcp/nm-dhcp-client.c @@ -1010,8 +1010,8 @@ set_property (GObject *object, guint prop_id, case PROP_IFACE: /* construct-only */ priv->iface = g_value_dup_string (value); - g_return_if_fail ( priv->iface - && nm_utils_is_valid_iface_name (priv->iface, NULL)); + g_return_if_fail (priv->iface); + nm_assert (nm_utils_ifname_valid_kernel (priv->iface, NULL)); break; case PROP_IFINDEX: /* construct-only */ @@ -1203,6 +1203,7 @@ nm_dhcp_client_class_init (NMDhcpClientClass *client_class) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + G_STATIC_ASSERT_EXPR (G_MAXINT32 == NM_DHCP_TIMEOUT_INFINITY); obj_properties[PROP_TIMEOUT] = g_param_spec_uint (NM_DHCP_CLIENT_TIMEOUT, "", "", 1, G_MAXINT32, NM_DHCP_TIMEOUT_DEFAULT, |