diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2019-08-01 19:31:36 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2019-08-10 19:27:02 +0100 |
| commit | dbbf21a75d225871cb7a44878ece42c5d79a1a2c (patch) | |
| tree | 3e96a3cdce26cee348aac179eb1e56ea11f5f203 /src | |
| parent | 30afa09ebdb98fdb50fc60f0ce0cb4974bde1225 (diff) | |
Routers: make retry_use_local_part default true when any non-domain condition is present. Bug 2408
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/deliver.c | 3 | ||||
| -rw-r--r-- | src/src/route.c | 3 |
2 files changed, 3 insertions, 3 deletions
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. */ |