daemon->icmp6fd is always valid when doing DHCPv6 now.

diff --git a/src/dhcp-common.c b/src/dhcp-common.c
index 76184529459728df41cf80b9d7bde2c3aaa7b764..7e99fc91233e7982de6803c79af4a2a753f490f0 100644 (file)
--- a/src/dhcp-common.c
+++ b/src/dhcp-common.c
@@ -827,7 +827,7 @@ void log_context(int family, struct dhcp_context *context)
       template = p;
       p += sprintf(p, ", ");
       
-      if (indextoname(daemon->doing_dhcp6 ? daemon->dhcp6fd : daemon->icmp6fd, context->if_index, ifrn_name))
+      if (indextoname(daemon->icmp6fd, context->if_index, ifrn_name))
        sprintf(p, "%s for %s", (context->flags & CONTEXT_OLD) ? "old prefix" : "constructed", ifrn_name);
     }
   else if (context->flags & CONTEXT_TEMPLATE)

diff --git a/src/dhcp6.c b/src/dhcp6.c
index c8b1d8512d00eb7853bfb4430050e0afad7b53d5..1a7aa48fb832cdbb61c928436a3f20ce4dd80c3b 100644 (file)
--- a/src/dhcp6.c
+++ b/src/dhcp6.c
@@ -608,7 +608,7 @@ static int construct_worker(struct in6_addr *local, int prefix,
   if (flags & IFACE_DEPRECATED)
     return 1;
 
-  if (!indextoname(daemon->doing_dhcp6 ? daemon->dhcp6fd : daemon->icmp6fd, if_index, ifrn_name))
+  if (!indextoname(daemon->icmp6fd, if_index, ifrn_name))
     return 0;
   
   for (template = daemon->dhcp6; template; template = template->next)