From ae76242fdf9ab5ec1c1c81a64030daf85e36582f Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Fri, 10 Jan 2014 18:15:16 +0000 Subject: [PATCH] Fix missing RA RDNS option with --dhcp-option=option6:23,[::] --- CHANGELOG | 4 ++++ src/radv.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 785eea4..165ec4f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,10 @@ version 2.69 Fix infinite loop associated with some --bogus-nxdomain configs. Thanks fogobogo for the bug report. + Fix missing RA RDNS option with configuration like + --dhcp-option=option6:23,[::] Thanks to Tsachi Kimeldorfer + for spotting the problem. + version 2.68 Use random addresses for DHCPv6 temporary address diff --git a/src/radv.c b/src/radv.c index 9838bb6..84c1aab 100644 --- a/src/radv.c +++ b/src/radv.c @@ -343,7 +343,7 @@ static void send_ra(time_t now, int iface, char *iface_name, struct in6_addr *de struct in6_addr *a = (struct in6_addr *)opt_cfg->val; done_dns = 1; - if (opt_cfg->len == 0 || (IN6_IS_ADDR_UNSPECIFIED(a) && parm.pref_time != 0)) + if (opt_cfg->len == 0 || (IN6_IS_ADDR_UNSPECIFIED(a) && parm.pref_time == 0)) continue; put_opt6_char(ICMP6_OPT_RDNSS);