diff options
author | Alfonso Sánchez-Beato <alfonso.sanchez-beato@canonical.com> | 2017-03-27 17:18:36 +0200 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-03-28 06:50:54 +0200 |
commit | 76cf0e590fff7206378f46568782d3b7244c2ad5 (patch) | |
tree | e3aa10516c1386aa629e3680441f74e6f5814ffb | |
parent | 1db6c80cee015cc50b95a8132859a30b8433c478 (diff) | |
download | NetworkManager-76cf0e590fff7206378f46568782d3b7244c2ad5.tar.gz |
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.
-rw-r--r-- | src/dhcp/nm-dhcp-client.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c index 28d6c5952e..5a465d8f94 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); |