From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 21 Aug 2017 19:46:52 +0000 (+0100)
Subject: Fix address ignore-errors flag bit initialisation and propagation
X-Git-Tag: exim-4_90_RC1~83
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a5853d7c97b23bf0e4c4438a3ac3f67f28292d6c;p=exim.git

Fix address ignore-errors flag bit initialisation and propagation

Broken-by: 7eb0e5d2b8
---

diff --git a/src/src/globals.c b/src/src/globals.c
index 7f6ce6d40..f3fdb5975 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -399,6 +399,7 @@ address_item address_defaults = {
 #ifdef EXPERIMENTAL_SRS
     .srs_sender =	NULL,
 #endif
+    .ignore_error =	FALSE,
 #ifdef SUPPORT_I18N
     .utf8_msg =		FALSE,
     .utf8_downcvt =	FALSE,
diff --git a/src/src/routers/queryprogram.c b/src/src/routers/queryprogram.c
index fc92835c0..abba024db 100644
--- a/src/src/routers/queryprogram.c
+++ b/src/src/routers/queryprogram.c
@@ -130,7 +130,7 @@ while (generated != NULL)
 
   next->parent = addr;
   next->prop = *addr_prop;
-  next->prop.ignore_error |= ignore_error;
+  next->prop.ignore_error = next->prop.ignore_error || ignore_error;
   next->start_router = rblock->redirect_router;
 
   next->next = *addr_new;
diff --git a/src/src/routers/redirect.c b/src/src/routers/redirect.c
index 005ec6f47..9923af585 100644
--- a/src/src/routers/redirect.c
+++ b/src/src/routers/redirect.c
@@ -390,7 +390,7 @@ while (generated)
     {
     BOOL ignore_error = next->prop.ignore_error;
     next->prop = *addr_prop;
-    next->prop.ignore_error |= ignore_error;
+    next->prop.ignore_error = ignore_error || addr->prop.ignore_error;
     }
   if (errors_address) next->prop.errors_address = errors_address;