From d59205c392bcca928fd713abea5a002a6ce96890 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Tue, 16 Jun 1998 05:47:05 +0000
Subject: Another option fix from Gunther.

svn path=/trunk/; revision=1937
---
 fetchmail.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'fetchmail.c')

diff --git a/fetchmail.c b/fetchmail.c
index 74b2edbc..f9e6c9c6 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -707,13 +707,13 @@ static void optmerge(struct query *h2, struct query *h1, int force)
      * as defaults).  If force is on, modify each h2 field whenever h1
      * is nonempty (treat h1 as an override).  
      */
-
-#define LIST_MERGE(fld) if (force ? !!h1->fld : !h2->fld) \
-					append_str_list(&h2->fld, &h1->fld)
-    LIST_MERGE(server.localdomains);
-    LIST_MERGE(localnames);
-    LIST_MERGE(mailboxes);
-    LIST_MERGE(smtphunt);
+#define LIST_MERGE(dstl, srcl) if (force ? !!srcl : !dstl) \
+    						free_str_list(&dstl), \
+						append_str_list(&dstl, &srcl)
+    LIST_MERGE(h2->server.localdomains, h1->server.localdomains);
+    LIST_MERGE(h2->localnames, h1->localnames);
+    LIST_MERGE(h2->mailboxes, h1->mailboxes);
+    LIST_MERGE(h2->smtphunt, h1->smtphunt);
 #undef LIST_MERGE
 
 #define FLAG_MERGE(fld) if (force ? !!h1->fld : !h2->fld) h2->fld = h1->fld
@@ -741,6 +741,7 @@ static void optmerge(struct query *h2, struct query *h1, int force)
     FLAG_MERGE(server.interface_pair);
 #endif /* linux */
 
+    FLAG_MERGE(wildcard);
     FLAG_MERGE(remotename);
     FLAG_MERGE(password);
     FLAG_MERGE(mda);
-- 
cgit v1.2.3