Merge ~mirespace/ubuntu/+source/dnsmasq:lp2015562-jammy-segfault-nullAAAAconfig into ubuntu/+source/dnsmasq:ubuntu/jammy-devel

[Miriam España Acebal]

[Miriam España Acebal (mirespace)]

Hi team!

As discussed in the last Bug Housekeeping meeting, the upstream fix proposed by the user effectively makes the issue goes away, but the code is so much refactoring work maybe not suitable for an SRU as commented by Bryce initially (thanks!).

Package (tested that it fixes the issue) is here:
ppa:mirespace/dnsmasq-lp2015562
https://launchpad.net/~mirespace/+archive/ubuntu/dnsmasq-lp2015562

The package is native, so no patches are being applied, and the changes have been cherry-picked directly.

The aim of opening this MP is to debate if we can narrow the bits to make it suitable/candidate for SRU process. I would to say that, for me, only changing a global definition value and affecting with it all the rest of the variables makes me think of a big change in behaviour, but I have to admit I didn't trace it completely on all the dnsmasq code.

Another thing that worries me is that I couldn't reproduce the issue on Kinetic, although the upstream version is the same. So I checked the "ubuntu differences" between the versions, and there are no such differences: https://paste.ubuntu.com/p/S39n5Yy9gT/ So... is really the problem on dnsmasq??? Maybe not.

Due to this uncertainty, I didn't prepare the SRU paperwork, but I will do it if we consider the fix OK (or we get a subset of the fix that can work).

[Miriam España Acebal (mirespace)]

Steps to reproduce are (thanks Sergio for your help on this!):

#0.Prepare a VM or Container. i.e:
# lxc launch ubuntu-daily:jammy Jdnsmasq

#1. Install dnsmasq
# apt update && apt upgrade -y
# apt install y dnsmasq

#2. Disable systemd-resolved service and enabling resolution through dnsmasq, configuring DNS servers through it.

# systemctl disable --now systemd-resolved.service
# rm -f /etc/resolv.conf
# cat > /etc/resolv.conf << __EOF__
nameserver 127.0.0.1
__EOF__
# echo "server 8.8.8.8" >> /etc/dnsmasq.conf (or edit the file to add it if you prefer)
# (Optional) echo "log-queries" >> /etc/dnsmasq.conf
# (optional) echo "log-debug" >> /etc/dnsmasq.conf
# systemctl start dnsmasq.service

3. Copy netflix-nov6.conf into /etc/dnsmasq.d/
# cat > /etc/dnsmasq.d/netflix-nov6.conf << __EOF__
# Null AAAA response on these domains
server=/netflix.com/#
address=/netflix.com/::
server=/netflix.net/#
address=/netflix.net/::
server=/nflxext.com/#
address=/nflxext.com/::
__EOF__

#4. Restart/reload dnsmasq
# systemctl restart dnsmasq

#5. Verify that dnsmasq resolves domains correctly:

root@Jdnsmasq:~# dig +short -tA ubuntu.com @127.0.0.1
185.125.190.21
185.125.190.20
185.125.190.29
root@Jdnsmasq:~# dig +short -tAAAA ubuntu.com @127.0.0.1
2620:2d:4000:1::28
2620:2d:4000:1::26
2620:2d:4000:1::27

#6. Perform a type65 / HTTPS recordtype query for netflix.com towards the dnsmasq server once or twice:

root@Jdnsmasq:~# dig +short -tTYPE65 netflix.com @127.0.0.1
root@Jdnsmasq:~# dig +short -tTYPE65 netflix.com @127.0.0.1
;; communications error to 127.0.0.1#53: timed out
;; communications error to 127.0.0.1#53: connection refused
;; communications error to 127.0.0.1#53: connection refused
;; no servers could be reached

#7. Check logs to verify segfault:
# journalctl -u dnsmasq

Apr 27 11:22:52 Jdnsmasq systemd[1]: Started dnsmasq - A lightweight DHCP and caching DNS server.
Apr 27 11:22:53 Jdnsmasq dnsmasq[111585]: query[type=65] netflix.com from 127.0.0.1
Apr 27 11:22:53 Jdnsmasq dnsmasq[111585]: config error is REFUSED (EDE: network error)
Apr 27 11:22:54 Jdnsmasq dnsmasq[111585]: query[type=65] netflix.com from 127.0.0.1
Apr 27 11:22:54 Jdnsmasq systemd[1]: dnsmasq.service: Main process exited, code=dumped, status=11/SEGV
Apr 27 11:22:54 Jdnsmasq systemd[1]: dnsmasq.service: Failed with result 'core-dump'.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Miriam.

This segmentation fault is a bit tricky to reproduce. For some reason, I was not able to make dnsmasq crash just by following the instructions from the report (even though I remember being able to see the crash before!), so I went on a parallel investigation to try and understand better what's going on.

Long story short, I found the upstream bug report here:

https://<email address hidden>/msg15459.html

And I also found that in order to reproduce the bug reliably I had to add yet another "server/address" pair to the configuration file provided by the reporter. I ended up with this:

server=/netflix.com/#
address=/netflix.com/::
server=/netflix.net/#
address=/netflix.net/::
server=/nflxext.com/#
address=/nflxext.com/::
server=/example.com/#
address=/example.com/::

Now I see the crash happen reliably.

OK, now let's talk about the proposed changes.

At first I was concerned about the redefinitions on dnsmasq.h, because it seemed like they could introduce some ABI breakage, but after looking deeper I came to believe that they are fine. They're internal to dnsmasq and it doesn't export the header anywhere, so it should be safe.

Now, what makes me uncomfortable are the changes introduced in the domain-match.c file. They lean toward the non-trivial side, and the code itself is not easy to follow. I would like to see a deeper verification to make sure that the domain matching functionality is not affected by the change being proposed here. Maybe a few simple testcases can do the trick and increase our confidence.

Unfortunately, I don't have enough time right now to do this verification. If you feel like doing it, that would be great (and I can also review the tests/results if needed). Otherwise, I think I will be a bit less busy in two weeks and I can try to help with this task.

As for whether this MP is "SRU material", I really can't say. On the one hand, the changes can be considered non-trivial, but that alone is not enough of a reason to give up. On the other hand, we were able to confirm that the backported patch fixes the issue. On top of that, I clone upstream's repository and checked the history of domain-match.c. There are fixes that seem important and that came after the patch you're backporting, but they don't seem to relate to this bug. This gives us a bit more confidence in the fix, since upstream has been carrying it for a while now without any apparent regressions. So, IMHO, we should proceed with the SRU once we have those test results and see how it will be received.

Before I forget, there are some minor nits that I found in the Test Plan:

- "apt install y dnsmasq" -- This needs a dash before the "y"

- echo "server 8.8.8.8" >> /etc/dnsmasq.conf -- This doesn't work; it should be "server=8.8.8.8", otherwise the service won't start.

- I believe you can use the example I posted above for the /etc/dnsmasq.d/netflix-nov6.conf file, because it seems to work reliably.

- "dig +short -tTYPE65 netflix.com @127.0.0.1" -- No need to use -tTYPE65 here. A simple "dig A test.netflix.net @127.0.0.1" should suffice.

Thanks a lot!

review: Needs Information

[Miriam España Acebal (mirespace)]

Hi again,

I'm working on a dep8 test for checking domain matching functionality (based on the ones I've found that were submitted to Debian at https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1034135 ) as I discussed in MM... without much luck since I'm dealing with test dependencies (I'm trying to figure out why):

 autopkgtest: WARNING: Test dependencies are unsatisfiable - calling apt install on test deps directly for further data about failing dependencies in test logs.
/bin/sh: 1: bind9-utils: not found
autopkgtest [12:46:20]: - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

(but bind9-utils can be installed if I log in to the virtual machine)

Thanks Sergio for your super review and for catching the errors on the steps to reproduce!!!

[Sergio Durigan Junior (sergiodj)]

> Hi again,

Hey Miriam :-),

> I'm working on a dep8 test for checking domain matching functionality (based
> on the ones I've found that were submitted to Debian at
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1034135 ) as I discussed in
> MM... without much luck since I'm dealing with test dependencies (I'm trying
> to figure out why):
>
> autopkgtest: WARNING: Test dependencies are unsatisfiable - calling apt
> install on test deps directly for further data about failing dependencies in
> test logs.
> /bin/sh: 1: bind9-utils: not found
> autopkgtest [12:46:20]: - - - - - - - - - - - - - - - - - - - - - - - - - - -
> - -
>
> (but bind9-utils can be installed if I log in to the virtual machine)

Hm, that's strange. The log is also a bit weird: it seems like the script is trying to invoke a binary called "bind9-utils", which doesn't exist. Can you provide more details, please? The dep8 script and the contents of d/t/control would be helpful.

> Thanks Sergio for your super review and for catching the errors on the steps
> to reproduce!!!

You're welcome!

[Miriam España Acebal (mirespace)]

Hi Sergio, I finally made the tests work!

autopkgtest -U -s --setup-commands="sudo systemctl disable --now systemd-resolved.service; rm -f /etc/resolv.conf; echo 'nameserver 127.0.0.1' > /etc/resolv.conf" -B ../dnsmasq_2.86-1.1ubuntu0.4~ppa2.dsc -- qemu ~/Working/Images/autopkgtest-jammy-amd64.img

Results:

autopkgtest [17:31:48]: @@@@@@@@@@@@@@@@@@@@ summary
smoke-test PASS
dhcp-test PASS
udp-packet-size-test PASS

These tests are based on the proposal made to Debian at https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1034135 by rouca@debian. I had to do some changes. Possibly is still needed a more "domain matching functionality" test. I would like to discuss that with you and if this test seems to you a starting point for that.

I doubted extracting the dnsmasq's configuration and interfaces setup for making it common to all the tests (they are pretty much the same), but after consideration, I thought that the removal of a test (if needed) would be easier to do if I left it as is.

To be honest, what was the tests proposal reporter's intention with the size udp test is unknown to me (he said it was unfinished).

Interesting what I learned about dig searches for ipv6: it launches some simultaneously, so you can get a timeout warning message (not on stderr). Then, noisy output could be gotten ( the grep -v can also be seen in bind9 testsuite).

Also, I included a setup-commands file with the intention to automatize it (I read that it should be installed in /usr/share/autopkgtest/setup-commads/), but I didn't finish to install there (I didn't found another package doing the same, except autopkgtest itself).

Thankyou!

[Sergio Durigan Junior (sergiodj)]

Hi Miriam,

I had some time to re-read our discussion and take a look at your branch. Thanks for the work you've done in it.

The dep8 tests you're proposing in this MP look like a good addition to the package (although I haven't looked deep into them), but as I mentioned to you earlier I believe that they more suitable for our development release, not for a Jammy SRU. The tests look complex and end up exercising several features that are not being touched by this proposed change, so in my mind they're orthogonal to the problem at hand.

Having said that, I also believe that it should be possible to use the SRU's Test Plan as a base to write a simple script to test the domain matching feature. You can think of a few possible scenarios to test:

- The regular "address=/domain/1.2.3.4", where we expect queries to "domain" to be translated to "1.2.3.4".

- The situation that causes the bug being fixed by this MP (i.e., several "server"/"address" directives in the file).

- Maybe another combination of "server"/"address", just in case.

In order to write such a test, you will need the "needs-root" restriction because you'll have to make sure systemd-resolved is disabled/stopped and that dnsmasq is started. You should be able to do everything inside a shell script.

This should be much simpler than dealing with the dep8 scripts you backported from Debian, and enough to provide a bit more confidence in the upstream patch.

Hopefully this is helpful. Please let me know if you need anything else from my side; I'll make sure to reply in a more timely manner :-).

[Miriam España Acebal (mirespace)]

Hi Sergio,

thanks for the talks and the on-live session we shared for this.

I updated the bug's description with the SRU paperwork. Please let me know what do you think about it, when it fits you well.

I removed the DEP8 tests and I rebuilt also the package without it (in the same ppa). Maybe you will need a debdiff from actual Jammy version to the proposed one in the ppa? I see the diff in the ppa is only for the versions inside it sadly .

Thanks!

P.S.: A thought: could that be a functionality which can be proposed to Launchpad team (to have also the debdiff against the latest version in the series, not only refered to the incremental build inside the ppa) ?)

[Sergio Durigan Junior (sergiodj)]

Hi Miriam!

Thank you very much for addressing my comments and updating the SRU text. It's looking great now. I double checked here and I could easily reproduce the problem by following the "Test Plan" section. I could also verify that the bug is fixed with the version of the package present in your PPA.

Thanks also for the "Other Info" section; that's exactly what I wanted :-). It is still possible that the SRU team will request more information from you (like more details about the change, or a more comprehensive testcase), but let's not get ahead of ourselves and just wait for their feedback.

I am sponsoring this upload. Thanks again for the patience and perseverance!

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: sergiodj, mirespace
Uploaders: sergiodj
MP auto-approved

review: Approve

diff --git a/debian/changelog b/debian/changelog
index b1d883a..23e6ba8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+dnsmasq (2.86-1.1ubuntu0.4) jammy; urgency=medium
+
+  * src/dnsmasq.h, src/domain-match.c: Fix confusion when using resolvconf
+    servers (combining server|address for a domain), resulting in the struct
+    server datastructure for server=/domain/# getting passed to
+    forward_query(), rapidly followed by a SEGV. This fix makes
+    server=/domain/# a fully fledged member of the priority list.
+    The code added here is a cherry pick released in upstream version
+    2.87, originating at
+    https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=de372d69
+    (LP: #2015562)
+
+ -- Miriam España Acebal <[e-mail]>  Thu, 20 Apr 2023 11:00:27 +0200
+
 dnsmasq (2.86-1.1ubuntu0.3) jammy-security; urgency=medium
 
   * SECURITY UPDATE: IP fragmentation
diff --git a/src/dnsmasq.h b/src/dnsmasq.h
index 8674823..08f2785 100644
--- a/src/dnsmasq.h
+++ b/src/dnsmasq.h
@@ -530,23 +530,23 @@ union mysockaddr {
 
 
 /* The actual values here matter, since we sort on them to get records in the order
-   IPv6 addr, IPv4 addr, all zero return, no-data return, send upstream. */
-#define SERV_LITERAL_ADDRESS   1  /* addr is the answer, or NoDATA is the answer, depending on the next three flags */
-#define SERV_ALL_ZEROS         2  /* return all zeros for A and AAAA */
-#define SERV_4ADDR             4  /* addr is IPv4 */
-#define SERV_6ADDR             8  /* addr is IPv6 */
-#define SERV_HAS_SOURCE       16  /* source address defined */
-#define SERV_FOR_NODOTS       32  /* server for names with no domain part only */
-#define SERV_WARNED_RECURSIVE 64  /* avoid warning spam */
-#define SERV_FROM_DBUS       128  /* 1 if source is DBus */
-#define SERV_MARK            256  /* for mark-and-delete and log code */
-#define SERV_WILDCARD        512  /* domain has leading '*' */ 
-#define SERV_USE_RESOLV     1024  /* forward this domain in the normal way */
-#define SERV_FROM_RESOLV    2048  /* 1 for servers from resolv, 0 for command line. */
-#define SERV_FROM_FILE      4096  /* read from --servers-file */
-#define SERV_LOOP           8192  /* server causes forwarding loop */
-#define SERV_DO_DNSSEC     16384  /* Validate DNSSEC when using this server */
-#define SERV_GOT_TCP       32768  /* Got some data from the TCP connection */
+   IPv6 addr, IPv4 addr, all zero return, resolvconf servers, upstream server, no-data return  */
+#define SERV_LITERAL_ADDRESS    1  /* addr is the answer, or NoDATA is the answer, depending on the next four flags */
+#define SERV_USE_RESOLV         2  /* forward this domain in the normal way */
+#define SERV_ALL_ZEROS          4  /* return all zeros for A and AAAA */
+#define SERV_4ADDR              8  /* addr is IPv4 */
+#define SERV_6ADDR             16  /* addr is IPv6 */
+#define SERV_HAS_SOURCE        32  /* source address defined */
+#define SERV_FOR_NODOTS        64  /* server for names with no domain part only */
+#define SERV_WARNED_RECURSIVE 128  /* avoid warning spam */
+#define SERV_FROM_DBUS        256  /* 1 if source is DBus */
+#define SERV_MARK             512  /* for mark-and-delete and log code */
+#define SERV_WILDCARD        1024  /* domain has leading '*' */ 
+#define SERV_FROM_RESOLV     2048  /* 1 for servers from resolv, 0 for command line. */
+#define SERV_FROM_FILE       4096  /* read from --servers-file */
+#define SERV_LOOP            8192  /* server causes forwarding loop */
+#define SERV_DO_DNSSEC      16384  /* Validate DNSSEC when using this server */
+#define SERV_GOT_TCP        32768  /* Got some data from the TCP connection */
 
 struct serverfd {
   int fd;
diff --git a/src/domain-match.c b/src/domain-match.c
index f8e4796..9ddb638 100644
--- a/src/domain-match.c
+++ b/src/domain-match.c
@@ -207,16 +207,16 @@ int lookup_domain(char *domain, int flags, int *lowout, int *highout)
 		}
 	    }
 	  
-	  if (found)
+	  if (found && filter_servers(try, flags, &nlow, &nhigh))
+	    /* We have a match, but it may only be (say) an IPv6 address, and
+	       if the query wasn't for an AAAA record, it's no good, and we need
+	       to continue generalising */
 	    {
 	      /* We've matched a setting which says to use servers without a domain.
 		 Continue the search with empty query */
-	      if (daemon->serverarray[try]->flags & SERV_USE_RESOLV)
+	      if (daemon->serverarray[nlow]->flags & SERV_USE_RESOLV)
 		crop_query = qlen;
-	      else if (filter_servers(try, flags, &nlow, &nhigh))
-		/* We have a match, but it may only be (say) an IPv6 address, and
-		   if the query wasn't for an AAAA record, it's no good, and we need
-		   to continue generalising */
+	      else
 		break;
 	    }
 	}
@@ -273,7 +273,7 @@ int filter_servers(int seed, int flags, int *lowout, int *highout)
     nlow--;
   
   while (nhigh < daemon->serverarraysz-1 && order_servers(daemon->serverarray[nhigh], daemon->serverarray[nhigh+1]) == 0)
-	nhigh++;
+    nhigh++;
   
   nhigh++;
   
@@ -293,10 +293,10 @@ int filter_servers(int seed, int flags, int *lowout, int *highout)
   else
     {
       /* Now the servers are on order between low and high, in the order
-	 IPv6 addr, IPv4 addr, return zero for both, send upstream, no-data return.
+	 IPv6 addr, IPv4 addr, return zero for both, resolvconf servers, send upstream, no-data return.
 	 
 	 See which of those match our query in that priority order and narrow (low, high) */
-
+      
       for (i = nlow; i < nhigh && (daemon->serverarray[i]->flags & SERV_6ADDR); i++);
       
       if (i != nlow && (flags & F_IPV6))
@@ -321,32 +321,40 @@ int filter_servers(int seed, int flags, int *lowout, int *highout)
 		{
 		  nlow = i;
 		  
-		  /* now look for a server */
-		  for (i = nlow; i < nhigh && !(daemon->serverarray[i]->flags & SERV_LITERAL_ADDRESS); i++);
-
+		  /* Short to resolv.conf servers */
+		  for (i = nlow; i < nhigh && (daemon->serverarray[i]->flags & SERV_USE_RESOLV); i++);
+		  
 		  if (i != nlow)
-		    {
-		      /* If we want a server that can do DNSSEC, and this one can't, 
-			 return nothing, similarly if were looking only for a server
-			 for a particular domain. */
-		      if ((flags & F_DNSSECOK) && !(daemon->serverarray[nlow]->flags & SERV_DO_DNSSEC))
-			nlow = nhigh;
-		      else if ((flags & F_DOMAINSRV) && daemon->serverarray[nlow]->domain_len == 0)
-			nlow = nhigh;
-		      else
-			nhigh = i;
-		    }
+		    nhigh = i;
 		  else
 		    {
-		      /* --local=/domain/, only return if we don't need a server. */
-		      if (flags & (F_DNSSECOK | F_DOMAINSRV | F_SERVER))
-			nhigh = i;
+		      /* now look for a server */
+		      for (i = nlow; i < nhigh && !(daemon->serverarray[i]->flags & SERV_LITERAL_ADDRESS); i++);
+		      
+		      if (i != nlow)
+			{
+			  /* If we want a server that can do DNSSEC, and this one can't, 
+			     return nothing, similarly if were looking only for a server
+			     for a particular domain. */
+			  if ((flags & F_DNSSECOK) && !(daemon->serverarray[nlow]->flags & SERV_DO_DNSSEC))
+			    nlow = nhigh;
+			  else if ((flags & F_DOMAINSRV) && daemon->serverarray[nlow]->domain_len == 0)
+			    nlow = nhigh;
+			  else
+			    nhigh = i;
+			}
+		      else
+			{
+			  /* --local=/domain/, only return if we don't need a server. */
+			  if (flags & (F_DNSSECOK | F_DOMAINSRV | F_SERVER))
+			    nhigh = i;
+			}
 		    }
 		}
 	    }
 	}
     }
-  
+
   *lowout = nlow;
   *highout = nhigh;
   
@@ -520,10 +528,10 @@ static int order_qsort(const void *a, const void *b)
   /* Sort all literal NODATA and local IPV4 or IPV6 responses together,
      in a very specific order. We flip the SERV_LITERAL_ADDRESS bit
      so the order is IPv6 literal, IPv4 literal, all-zero literal, 
-     upstream server, NXDOMAIN literal. */
+     unqualified servers, upstream server, NXDOMAIN literal. */
   if (rc == 0)
-    rc = ((s2->flags & (SERV_LITERAL_ADDRESS | SERV_4ADDR | SERV_6ADDR | SERV_ALL_ZEROS)) ^ SERV_LITERAL_ADDRESS) -
-      ((s1->flags & (SERV_LITERAL_ADDRESS | SERV_4ADDR | SERV_6ADDR | SERV_ALL_ZEROS)) ^ SERV_LITERAL_ADDRESS);
+    rc = ((s2->flags & (SERV_LITERAL_ADDRESS | SERV_4ADDR | SERV_6ADDR | SERV_USE_RESOLV | SERV_ALL_ZEROS)) ^ SERV_LITERAL_ADDRESS) -
+      ((s1->flags & (SERV_LITERAL_ADDRESS | SERV_4ADDR | SERV_6ADDR | SERV_USE_RESOLV | SERV_ALL_ZEROS)) ^ SERV_LITERAL_ADDRESS);
 
   /* Finally, order by appearance in /etc/resolv.conf etc, for --strict-order */
   if (rc == 0)
@@ -630,7 +638,7 @@ int add_update_server(int flags,
     {
       size_t size;
 
-      if (flags & SERV_LITERAL_ADDRESS)
+      if (flags & SERV_IS_LOCAL)
 	{
 	  if (flags & SERV_6ADDR)
 	    size = sizeof(struct serv_addr6);
@@ -649,10 +657,19 @@ int add_update_server(int flags,
 	{
 	  serv->next = daemon->local_domains;
 	  daemon->local_domains = serv;
+
+	  if (flags & SERV_4ADDR)
+	    ((struct serv_addr4*)serv)->addr = local_addr->addr4;
+	  
+	  if (flags & SERV_6ADDR)
+	    ((struct serv_addr6*)serv)->addr = local_addr->addr6;
 	}
       else
 	{
 	  struct server *s;
+
+	  memset(serv, 0, sizeof(struct server));
+	  
 	  /* Add to the end of the chain, for order */
 	  if (!daemon->servers)
 	    daemon->servers = serv;
@@ -662,37 +679,23 @@ int add_update_server(int flags,
 	      s->next = serv;
 	    }
 	  
-	  serv->next = NULL;
+#ifdef HAVE_LOOP
+	  serv->uid = rand32();
+#endif      
+	  
+	  if (interface)
+	    safe_strncpy(serv->interface, interface, sizeof(serv->interface));
+	  if (addr)
+	    serv->addr = *addr;
+	  if (source_addr)
+	    serv->source_addr = *source_addr;
 	}
     }
   
-  if (!(flags & SERV_IS_LOCAL))
-    memset(serv, 0, sizeof(struct server));
-  
   serv->flags = flags;
   serv->domain = alloc_domain;
   serv->domain_len = strlen(alloc_domain);
   
-  if (flags & SERV_4ADDR)
-    ((struct serv_addr4*)serv)->addr = local_addr->addr4;
-
-  if (flags & SERV_6ADDR)
-    ((struct serv_addr6*)serv)->addr = local_addr->addr6;
-  
-  if (!(flags & SERV_IS_LOCAL))
-    {
-#ifdef HAVE_LOOP
-      serv->uid = rand32();
-#endif      
-      
-      if (interface)
-	safe_strncpy(serv->interface, interface, sizeof(serv->interface));
-      if (addr)
-	serv->addr = *addr;
-      if (source_addr)
-	serv->source_addr = *source_addr;
-    }
-
   return 1;
 }