From 32b559044e19821f34d13943a0bd65d404526f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Wed, 28 May 2014 15:53:17 +0200 Subject: [PATCH] dhcp: dhclient v6 stores address lifetimes in different variables (rh #1086237) It uses 'new_max_life' for valid lifetime and 'new_preferred_life' for preferred lifetime. https://bugzilla.redhat.com/show_bug.cgi?id=1086237 See also https://bugzilla.redhat.com/show_bug.cgi?id=1032809 --- src/dhcp-manager/nm-dhcp-client.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c index 6cec7448a1..c8a94616fa 100644 --- a/src/dhcp-manager/nm-dhcp-client.c +++ b/src/dhcp-manager/nm-dhcp-client.c @@ -1388,10 +1388,16 @@ ip6_options_to_config (NMDHCPClient *self) ip6_config = nm_ip6_config_new (); - str = g_hash_table_lookup (priv->options, "new_dhcp_lease_time"); + str = g_hash_table_lookup (priv->options, "new_max_life"); if (str) { - address.lifetime = address.preferred = strtoul (str, NULL, 10); - nm_log_info (LOGD_DHCP6, " lease time %d", address.lifetime); + address.lifetime = strtoul (str, NULL, 10); + nm_log_info (LOGD_DHCP6, " valid_lft %d", address.lifetime); + } + + str = g_hash_table_lookup (priv->options, "new_preferred_life"); + if (str) { + address.preferred = strtoul (str, NULL, 10); + nm_log_info (LOGD_DHCP6, " preferred_lft %d", address.preferred); } str = g_hash_table_lookup (priv->options, "new_ip6_address");