Fix --add-subnet when returning empty or default subnet.

src/edns0.c

@@ -281,8 +281,11 @@ static size_t calc_subnet_opt(struct subnet_opt *opt, union mysockaddr *source)
   void *addrp;
   int sa_family = source->sa.sa_family;
 
+  opt->source_netmask = 0;
+  opt->scope_netmask = 0;
+
 #ifdef HAVE_IPV6
-  if (source->sa.sa_family == AF_INET6)
+  if (source->sa.sa_family == AF_INET6 && daemon->add_subnet6)
     {
       opt->source_netmask = daemon->add_subnet6->mask;
       if (daemon->add_subnet6->addr_used) 
@@ -293,8 +296,9 @@ static size_t calc_subnet_opt(struct subnet_opt *opt, union mysockaddr *source)
       else 
 	addrp = &source->in6.sin6_addr;
     }
-  else
 #endif
+
+  if (source->sa.sa_family == AF_INET && daemon->add_subnet4)
     {
       opt->source_netmask = daemon->add_subnet4->mask;
       if (daemon->add_subnet4->addr_used)
@@ -306,16 +310,16 @@ static size_t calc_subnet_opt(struct subnet_opt *opt, union mysockaddr *source)
 	  addrp = &source->in.sin_addr;
     }
   
-  opt->scope_netmask = 0;
-  len = 0;
-  
-  if (opt->source_netmask != 0)
-    {
 #ifdef HAVE_IPV6
   opt->family = htons(sa_family == AF_INET6 ? 2 : 1);
 #else
   opt->family = htons(1);
 #endif
+  
+  len = 0;
+  
+  if (opt->source_netmask != 0)
+    {
       len = ((opt->source_netmask - 1) >> 3) + 1;
       memcpy(opt->addr, addrp, len);
       if (opt->source_netmask & 7)

src/option.c

@@ -1647,9 +1647,9 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
 	    
           daemon->add_subnet4 = new;
 
-          new = opt_malloc(sizeof(struct mysubnet));
           if (comma)
             {
+	      new = opt_malloc(sizeof(struct mysubnet));
 	      if ((end = split_chr(comma, '/')))
 		{
 		  /* has subnet+len */
@@ -1665,9 +1665,10 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
                   if (!atoi_check(comma, &new->mask))
                     ret_err(gen_err);
                 }
-            }
+          
 	      daemon->add_subnet6 = new;
 	    }
+	}
       break;
 
     case '1': /* --enable-dbus */