From dbbf21a75d225871cb7a44878ece42c5d79a1a2c Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 1 Aug 2019 19:31:36 +0100 Subject: Routers: make retry_use_local_part default true when any non-domain condition is present. Bug 2408 --- src/src/deliver.c | 3 +-- src/src/route.c | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/src/deliver.c b/src/src/deliver.c index 66e49d371..a82a04f42 100644 --- a/src/src/deliver.c +++ b/src/src/deliver.c @@ -4794,7 +4794,6 @@ all pipes, so I do not see a reason to use non-blocking IO here for(; addr; addr = addr->next) { uschar *ptr; - retry_item *r; /* The certificate verification status goes into the flags */ if (tls_out.certificate_verified) setflag(addr, af_cert_verified); @@ -4894,7 +4893,7 @@ all pipes, so I do not see a reason to use non-blocking IO here /* Retry information: for most success cases this will be null. */ - for (r = addr->retries; r; r = r->next) + for (retry_item * r = addr->retries; r; r = r->next) { sprintf(CS big_buffer, "%c%.500s", r->flags, r->key); ptr = big_buffer + Ustrlen(big_buffer+2) + 3; diff --git a/src/src/route.c b/src/src/route.c index 41716bc0e..c6119eed0 100644 --- a/src/src/route.c +++ b/src/src/route.c @@ -281,7 +281,8 @@ for (router_instance * r = routers; r; r = r->next) TRUE; otherwise its default is FALSE. */ if (r->retry_use_local_part == TRUE_UNSET) - r->retry_use_local_part = r->check_local_user; + r->retry_use_local_part = + r->check_local_user || r->local_parts || r->condition || r->prefix || r->suffix || r->senders || r->require_files; /* Build a host list if fallback hosts is set. */ -- cgit v1.2.3