String handling: refactor the expanding-string routines and users to use a descriptor...

[exim.git] / src / src / route.c

diff --git a/src/src/route.c b/src/src/route.c
index a175407c6ca5bd2df62c2fcd266f79388fef8317..1b9676f3f87ffd3aea6017f76b67bea0f2e93a87 100644 (file)
--- a/src/src/route.c
+++ b/src/src/route.c
@@ -140,7 +140,7 @@ optionlist optionlist_routers[] = {
                  (void *)offsetof(router_instance, verify_sender) }
 };
 
-int optionlist_routers_size = sizeof(optionlist_routers)/sizeof(optionlist);
+int optionlist_routers_size = nelem(optionlist_routers);
 
 
 #ifdef MACRO_PREDEF
@@ -1365,7 +1365,7 @@ new->prop.errors_address = parent->prop.errors_address;
 
 /* Copy the propagated flags and address_data from the original. */
 
-copyflag(new, addr, af_propagate);
+new->prop.ignore_error = addr->prop.ignore_error;
 new->prop.address_data = addr->prop.address_data;
 new->dsn_flags = addr->dsn_flags;
 new->dsn_orcpt = addr->dsn_orcpt;