From a810559b243560d26a9ccde7330aadafeb7d4cbe Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Wed, 25 Sep 2013 15:36:00 +0100 Subject: [PATCH] daemon->icmp6fd is always valid when doing DHCPv6 now. --- src/dhcp-common.c | 2 +- src/dhcp6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dhcp-common.c b/src/dhcp-common.c index 7618452..7e99fc9 100644 --- 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 c8b1d85..1a7aa48 100644 --- 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)