tweak debug

diff --git a/src/src/routers/accept.c b/src/src/routers/accept.c
index 5b247131f5d02a90ba6c6f51c957af3a6b2cb3ab..aadd7046ee2b7c8070b73ab20d4bbef859c9290e 100644 (file)
--- 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
   },
   .dyn_magic =         ROUTER_MAGIC,
 # endif
   },

-.code =                accept_router_entry,
+.code =                        accept_router_entry,

 .tidyup =              NULL,     /* no tidyup entry */
 .ri_flags =            ri_yestransport
 };
 .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 6593ef2b6ede6e728d3d619f8097ea632b24a5f8..4900c470547090b4155c277b36359907ef52b672 100644 (file)
--- 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;
 uschar * s;
 
 *errors_to = addr->prop.errors_address;

+GET_OPTION("errors_to");

 if (!rblock->errors_to) return OK;
 
 if (!rblock->errors_to) return OK;
 

-GET_OPTION("errors_to");

 if (!(s = expand_string(rblock->errors_to)))
   {
   if (f.expand_string_forcedfail)
 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 a9cffab72fcdcec4f5cfb3ee512f16b5dc1c1153..b455d9ab54b9715691343ebdc06f0862e5660f0e 100644 (file)
--- 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;
 
 /* 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;
 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 */
 *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;
 if (rblock->remove_headers)
   {
   const uschar * list = rblock->remove_headers;