]> git.ipfire.org Git - people/ms/dnsmasq.git/commitdiff
Rationalise 5e3e464ac4022ee0b3794513abe510817e2cf3ca
authorSimon Kelley <simon@thekelleys.org.uk>
Sat, 26 Sep 2015 20:40:45 +0000 (21:40 +0100)
committerSimon Kelley <simon@thekelleys.org.uk>
Sat, 26 Sep 2015 20:40:45 +0000 (21:40 +0100)
src/rfc3315.c

index 3f1f9ee8f3d960ba09383337a923a4823e86108f..3ed8623fd4165884314a6a705027df7c1328a96c 100644 (file)
@@ -1324,8 +1324,7 @@ static struct dhcp_netid *add_options(struct state *state, int do_refresh)
       if (opt_cfg->opt == OPTION6_DNS_SERVER)
        done_dns = 1;
       
-      /* Empty DNS_SERVER option will not set DHOPT_ADDR6 */
-      if ((opt_cfg->flags & DHOPT_ADDR6) || opt_cfg->opt == OPTION6_DNS_SERVER)
+      if (opt_cfg->flags & DHOPT_ADDR6)
        {
          int len, j;
          struct in6_addr *a;