From: Jeremy Harris Date: Fri, 16 Aug 2024 10:53:30 +0000 (+0100) Subject: tweak debug X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/62ccb00d5ca29f962c3691201e143667ff80bc6c tweak debug --- diff --git a/src/src/routers/accept.c b/src/src/routers/accept.c index 5b247131f..aadd7046e 100644 --- a/src/src/routers/accept.c +++ b/src/src/routers/accept.c @@ -159,7 +159,7 @@ router_info accept_router_info = .dyn_magic = ROUTER_MAGIC, # endif }, -.code = accept_router_entry, +.code = accept_router_entry, .tidyup = NULL, /* no tidyup entry */ .ri_flags = ri_yestransport }; diff --git a/src/src/routers/rf_get_errors_address.c b/src/src/routers/rf_get_errors_address.c index 6593ef2b6..4900c4705 100644 --- a/src/src/routers/rf_get_errors_address.c +++ b/src/src/routers/rf_get_errors_address.c @@ -41,9 +41,9 @@ rf_get_errors_address(address_item * addr, router_instance * rblock, uschar * s; *errors_to = addr->prop.errors_address; +GET_OPTION("errors_to"); if (!rblock->errors_to) return OK; -GET_OPTION("errors_to"); if (!(s = expand_string(rblock->errors_to))) { if (f.expand_string_forcedfail) diff --git a/src/src/routers/rf_get_munge_headers.c b/src/src/routers/rf_get_munge_headers.c index a9cffab72..b455d9ab5 100644 --- a/src/src/routers/rf_get_munge_headers.c +++ b/src/src/routers/rf_get_munge_headers.c @@ -36,6 +36,7 @@ rf_get_munge_headers(address_item *addr, router_instance *rblock, /* Default is to retain existing headers */ *extra_headers = addr->prop.extra_headers; +GET_OPTION("headers_add"); if (rblock->extra_headers) { const uschar * list = rblock->extra_headers; @@ -88,6 +89,7 @@ if (rblock->extra_headers) *remove_headers = addr->prop.remove_headers; /* Expand items from colon-sep list separately, then build new list */ +GET_OPTION("headers_remove"); if (rblock->remove_headers) { const uschar * list = rblock->remove_headers;