From d9603ef7817f5f1870144b1465cfbdd51c174cae Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@thekelleys.org.uk>
Date: Sun, 26 Jan 2020 18:13:35 +0000
Subject: [PATCH] Fix the disease, not the symptom in
 e40d8bef3bbf2fe8e1287663b2c84817066b3434

---
 src/network.c | 2 +-
 src/option.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/network.c b/src/network.c
index be678ae..e656ceb 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1531,7 +1531,7 @@ void check_servers(void)
 #endif
 	      if (!(serv->flags & SERV_HAS_DOMAIN))
 		s1 = _("unqualified"), s2 = _("names");
-	      else if (serv->domain == NULL || strlen(serv->domain) == 0)
+	      else if (strlen(serv->domain) == 0)
 		s1 = _("default"), s2 = "";
 	      else
 		s1 = _("domain"), s2 = serv->domain;
diff --git a/src/option.c b/src/option.c
index f110b75..f77545f 100644
--- a/src/option.c
+++ b/src/option.c
@@ -2583,7 +2583,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
 	serv = newlist;
 	while (serv->next)
 	  {
-	    serv->next->flags = serv->flags;
+	    serv->next->flags |= serv->flags & ~(SERV_HAS_DOMAIN | SERV_FOR_NODOTS);
 	    serv->next->addr = serv->addr;
 	    serv->next->source_addr = serv->source_addr;
 	    strcpy(serv->next->interface, serv->interface);