[PATCH] Remove assertion for empty DHCP options



It turns out that some routers return responses to DHCP6
Information-request messages that do not contain any of the options
that we insert in the "options" table. When that happened and the
info-only flag for DHCP6 was set, the assertion was triggered and
NetworkManager crashed. We remove the assertion as having empty options
is a possibility and is harmless anyway. This happened while using the
internal dhclient.
---
 src/dhcp/nm-dhcp-client.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c
index 28d6c59..5a465d8 100644
--- a/src/dhcp/nm-dhcp-client.c
+++ b/src/dhcp/nm-dhcp-client.c
@@ -298,7 +298,6 @@ nm_dhcp_client_set_state (NMDhcpClient *self,
                g_assert (   (priv->ipv6 && NM_IS_IP6_CONFIG (ip_config))
                          || (!priv->ipv6 && NM_IS_IP4_CONFIG (ip_config)));
                g_assert (options);
-               g_assert_cmpint (g_hash_table_size (options), >, 0);
        } else {
                g_assert (ip_config == NULL);
                g_assert (options == NULL);
-- 
2.9.3



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]