Build: disable OCSP, AUTH_TLS and EXPERIMENTAL_CERTNAMES if SUPPORT_TLS is not enabled

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

diff --git a/src/src/route.c b/src/src/route.c
index f8bacf11be7f2acc90f9b67708927034a15dba70..3ca1afbfb63bf97cbc47930d341ead5993a70ff2 100644 (file)
--- a/src/src/route.c
+++ b/src/src/route.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) University of Cambridge 1995 - 2015 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions concerned with routing, and the list of generic router options. */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions concerned with routing, and the list of generic router options. */


@@ -54,10 +54,16 @@ optionlist optionlist_routers[] = {
                  (void *)offsetof(router_instance, debug_string) },
   { "disable_logging",    opt_bool | opt_public,
                  (void *)offsetof(router_instance, disable_logging) },
                  (void *)offsetof(router_instance, debug_string) },
   { "disable_logging",    opt_bool | opt_public,
                  (void *)offsetof(router_instance, disable_logging) },

+  { "dnssec_request_domains",            opt_stringptr|opt_public,
+                 (void *)offsetof(router_instance, dnssec.request) },
+  { "dnssec_require_domains",            opt_stringptr|opt_public,
+                 (void *)offsetof(router_instance, dnssec.require) },

   { "domains",            opt_stringptr|opt_public,
                  (void *)offsetof(router_instance, domains) },
   { "driver",             opt_stringptr|opt_public,
                  (void *)offsetof(router_instance, driver_name) },
   { "domains",            opt_stringptr|opt_public,
                  (void *)offsetof(router_instance, domains) },
   { "driver",             opt_stringptr|opt_public,
                  (void *)offsetof(router_instance, driver_name) },

+  { "dsn_lasthop",        opt_bool|opt_public,
+                 (void *)offsetof(router_instance, dsn_lasthop) },

   { "errors_to",          opt_stringptr|opt_public,
                  (void *)(offsetof(router_instance, errors_to)) },
   { "expn",               opt_bool|opt_public,
   { "errors_to",          opt_stringptr|opt_public,
                  (void *)(offsetof(router_instance, errors_to)) },
   { "expn",               opt_bool|opt_public,


@@ -137,6 +143,19 @@ optionlist optionlist_routers[] = {
 int optionlist_routers_size = sizeof(optionlist_routers)/sizeof(optionlist);
 
 
 int optionlist_routers_size = sizeof(optionlist_routers)/sizeof(optionlist);
 
 

+void
+readconf_options_routers(void)
+{
+struct router_info * ri;
+
+readconf_options_from_list(optionlist_routers, nelem(optionlist_routers), US"RT");
+
+for (ri = routers_available; ri->driver_name[0]; ri++)
+  {
+  macro_create(string_sprintf("_DRVR_RTR_%T", ri->driver_name), US"y", FALSE, TRUE);
+  readconf_options_from_list(ri->options, (unsigned)*ri->options_count, ri->driver_name);
+  }
+}

 
 /*************************************************
 *          Set router pointer from name          *
 
 /*************************************************
 *          Set router pointer from name          *


@@ -160,7 +179,7 @@ set_router(router_instance *r, uschar *name, router_instance **ptr, BOOL after)
 BOOL afterthis = FALSE;
 router_instance *rr;
 
 BOOL afterthis = FALSE;
 router_instance *rr;
 

-for (rr = routers; rr != NULL; rr = rr->next)
+for (rr = routers; rr; rr = rr->next)

   {
   if (Ustrcmp(name, rr->name) == 0)
     {
   {
   if (Ustrcmp(name, rr->name) == 0)
     {


@@ -170,7 +189,7 @@ for (rr = routers; rr != NULL; rr = rr->next)
   if (rr == r) afterthis = TRUE;
   }
 
   if (rr == r) afterthis = TRUE;
   }
 

-if (rr == NULL)
+if (!rr)

   log_write(0, LOG_PANIC_DIE|LOG_CONFIG,
     "new_router \"%s\" not found for \"%s\" router", name, r->name);
 
   log_write(0, LOG_PANIC_DIE|LOG_CONFIG,
     "new_router \"%s\" not found for \"%s\" router", name, r->name);
 


@@ -206,7 +225,7 @@ readconf_driver_init(US"router",
   optionlist_routers,                 /* generic options */
   optionlist_routers_size);
 
   optionlist_routers,                 /* generic options */
   optionlist_routers_size);
 

-for (r = routers; r != NULL; r = r->next)
+for (r = routers; r; r = r->next)

   {
   uschar *s = r->self;
 
   {
   uschar *s = r->self;
 


@@ -270,6 +289,9 @@ for (r = routers; r != NULL; r = r->next)
 
   if (r->pass_router_name != NULL)
     set_router(r, r->pass_router_name, &(r->pass_router), TRUE);
 
   if (r->pass_router_name != NULL)
     set_router(r, r->pass_router_name, &(r->pass_router), TRUE);

+
+  DEBUG(D_route) debug_printf("DSN: %s %s\n", r->name,
+       r->dsn_lasthop ? "lasthop set" : "propagating DSN");

   }
 }
 
   }
 }
 


@@ -288,8 +310,8 @@ void
 route_tidyup(void)
 {
 router_instance *r;
 route_tidyup(void)
 {
 router_instance *r;

-for (r = routers; r != NULL; r = r->next)
-  if (r->info->tidyup != NULL) (r->info->tidyup)(r);
+for (r = routers; r; r = r->next)
+  if (r->info->tidyup) (r->info->tidyup)(r);

 }
 
 
 }
 
 


@@ -310,20 +332,19 @@ Returns:        length of matching prefix or zero
 */
 
 int
 */
 
 int

-route_check_prefix(uschar *local_part, uschar *prefixes)
+route_check_prefix(const uschar *local_part, const uschar *prefixes)

 {
 int sep = 0;
 uschar *prefix;
 {
 int sep = 0;
 uschar *prefix;

-uschar *listptr = prefixes;
+const uschar *listptr = prefixes;

 uschar prebuf[64];
 
 uschar prebuf[64];
 

-while ((prefix = string_nextinlist(&listptr, &sep, prebuf, sizeof(prebuf)))
-       != NULL)
+while ((prefix = string_nextinlist(&listptr, &sep, prebuf, sizeof(prebuf))))

   {
   int plen = Ustrlen(prefix);
   if (prefix[0] == '*')
     {
   {
   int plen = Ustrlen(prefix);
   if (prefix[0] == '*')
     {

-    uschar *p;
+    const uschar *p;

     prefix++;
     for (p = local_part + Ustrlen(local_part) - (--plen);
          p >= local_part; p--)
     prefix++;
     for (p = local_part + Ustrlen(local_part) - (--plen);
          p >= local_part; p--)


@@ -354,21 +375,20 @@ Returns:        length of matching suffix or zero
 */
 
 int
 */
 
 int

-route_check_suffix(uschar *local_part, uschar *suffixes)
+route_check_suffix(const uschar *local_part, const uschar *suffixes)

 {
 int sep = 0;
 int alen = Ustrlen(local_part);
 uschar *suffix;
 {
 int sep = 0;
 int alen = Ustrlen(local_part);
 uschar *suffix;

-uschar *listptr = suffixes;
+const uschar *listptr = suffixes;

 uschar sufbuf[64];
 
 uschar sufbuf[64];
 

-while ((suffix = string_nextinlist(&listptr, &sep, sufbuf, sizeof(sufbuf)))
-     != NULL)
+while ((suffix = string_nextinlist(&listptr, &sep, sufbuf, sizeof(sufbuf))))

   {
   int slen = Ustrlen(suffix);
   if (suffix[slen-1] == '*')
     {
   {
   int slen = Ustrlen(suffix);
   if (suffix[slen-1] == '*')
     {

-    uschar *p, *pend;
+    const uschar *p, *pend;

     pend = local_part + alen - (--slen) + 1;
     for (p = local_part; p < pend; p++)
       if (strncmpic(suffix, p, slen) == 0) return alen - (p - local_part);
     pend = local_part + alen - (--slen) + 1;
     for (p = local_part; p < pend; p++)
       if (strncmpic(suffix, p, slen) == 0) return alen - (p - local_part);


@@ -411,46 +431,37 @@ Returns:         OK     item is in list
 */
 
 static int
 */
 
 static int

-route_check_dls(uschar *rname, uschar *type, uschar *list, tree_node
-  **anchorptr, unsigned int *cache_bits, int listtype, uschar *domloc,
-  uschar **ldata, BOOL caseless, uschar **perror)
+route_check_dls(uschar *rname, uschar *type, const uschar *list,
+  tree_node **anchorptr, unsigned int *cache_bits, int listtype,
+  const uschar *domloc, const uschar **ldata, BOOL caseless, uschar **perror)

 {
 {

-int rc;
-
-if (list == NULL) return OK;   /* Empty list always succeeds */
+if (!list) return OK;   /* Empty list always succeeds */

 
 DEBUG(D_route) debug_printf("checking %s\n", type);
 
 /* The domain and local part use the same matching function, whereas sender
 has its own code. */
 
 
 DEBUG(D_route) debug_printf("checking %s\n", type);
 
 /* The domain and local part use the same matching function, whereas sender
 has its own code. */
 

-if (domloc != NULL)
-  {
-  rc = match_isinlist(domloc, &list, 0, anchorptr, cache_bits, listtype,
-    caseless, ldata);
-  }
-else
-  {
-  uschar *address = (sender_address == NULL)? US"" : sender_address;
-  rc = match_address_list(address, TRUE, TRUE, &list, cache_bits, -1, 0,
-    &sender_data);
-  }
-
-switch(rc)
+switch(domloc
+  ? match_isinlist(domloc, &list, 0, anchorptr, cache_bits, listtype,
+    caseless, ldata)
+  : match_address_list(sender_address ? sender_address : US"",
+    TRUE, TRUE, &list, cache_bits, -1, 0, CUSS &sender_data)
+      )

   {
   case OK:
   {
   case OK:

-  return OK;
+    return OK;

 
   case FAIL:
 
   case FAIL:

-  *perror = string_sprintf("%s router skipped: %s mismatch", rname, type);
-  DEBUG(D_route) debug_printf("%s\n", *perror);
-  return SKIP;
+    *perror = string_sprintf("%s router skipped: %s mismatch", rname, type);
+    DEBUG(D_route) debug_printf("%s\n", *perror);
+    return SKIP;

 
   default:      /* Paranoia, and keeps compilers happy */
   case DEFER:
 
   default:      /* Paranoia, and keeps compilers happy */
   case DEFER:

-  *perror = string_sprintf("%s check lookup or other defer", type);
-  DEBUG(D_route) debug_printf("%s\n", *perror);
-  return DEFER;
+    *perror = string_sprintf("%s check lookup or other defer", type);
+    DEBUG(D_route) debug_printf("%s\n", *perror);
+    return DEFER;

   }
 }
 
   }
 }
 


@@ -497,9 +508,9 @@ uschar *sp = rp + 1;
 DEBUG(D_route) debug_printf("route_check_access(%s,%d,%d,%o)\n", path,
   (int)uid, (int)gid, bits);
 
 DEBUG(D_route) debug_printf("route_check_access(%s,%d,%d,%o)\n", path,
   (int)uid, (int)gid, bits);
 

-if (rp == NULL) return FALSE;
+if (!rp) return FALSE;

 
 

-while ((slash = Ustrchr(sp, '/')) != NULL)
+while ((slash = Ustrchr(sp, '/')))

   {
   *slash = 0;
   DEBUG(D_route) debug_printf("stat %s\n", rp);
   {
   *slash = 0;
   DEBUG(D_route) debug_printf("stat %s\n", rp);


@@ -561,23 +572,23 @@ Returns:   OK if s == NULL or all tests are as required
            SKIP otherwise
 */
 
            SKIP otherwise
 */
 

-int
-check_files(uschar *s, uschar **perror)
+static int
+check_files(const uschar *s, uschar **perror)

 {
 int sep = 0;              /* List has default separators */
 uid_t uid = 0;            /* For picky compilers */
 gid_t gid = 0;            /* For picky compilers */
 BOOL ugid_set = FALSE;
 {
 int sep = 0;              /* List has default separators */
 uid_t uid = 0;            /* For picky compilers */
 gid_t gid = 0;            /* For picky compilers */
 BOOL ugid_set = FALSE;

-uschar *check, *listptr;
+const uschar *listptr;
+uschar *check;

 uschar buffer[1024];
 
 uschar buffer[1024];
 

-if (s == NULL) return OK;
+if (!s) return OK;

 
 DEBUG(D_route) debug_printf("checking require_files\n");
 
 listptr = s;
 
 DEBUG(D_route) debug_printf("checking require_files\n");
 
 listptr = s;

-while ((check = string_nextinlist(&listptr, &sep, buffer, sizeof(buffer)))
-        != NULL)
+while ((check = string_nextinlist(&listptr, &sep, buffer, sizeof(buffer))))

   {
   int rc;
   int eacces_code = 0;
   {
   int rc;
   int eacces_code = 0;


@@ -585,7 +596,7 @@ while ((check = string_nextinlist(&listptr, &sep, buffer, sizeof(buffer)))
   struct stat statbuf;
   uschar *ss = expand_string(check);
 
   struct stat statbuf;
   uschar *ss = expand_string(check);
 

-  if (ss == NULL)
+  if (!ss)

     {
     if (expand_string_forcedfail) continue;
     *perror = string_sprintf("failed to expand \"%s\" for require_files: %s",
     {
     if (expand_string_forcedfail) continue;
     *perror = string_sprintf("failed to expand \"%s\" for require_files: %s",


@@ -876,8 +887,8 @@ if (verify == v_expn && !r->expn)
 /* Skip this router if there's a domain mismatch. */
 
 if ((rc = route_check_dls(r->name, US"domains", r->domains, &domainlist_anchor,
 /* Skip this router if there's a domain mismatch. */
 
 if ((rc = route_check_dls(r->name, US"domains", r->domains, &domainlist_anchor,

-     addr->domain_cache, TRUE, addr->domain, &deliver_domain_data, MCL_DOMAIN,
-     perror)) != OK)
+     addr->domain_cache, TRUE, addr->domain, CUSS &deliver_domain_data,
+     MCL_DOMAIN, perror)) != OK)

   return rc;
 
 /* Skip this router if there's a local part mismatch. We want to pass over the
   return rc;
 
 /* Skip this router if there's a local part mismatch. We want to pass over the


@@ -887,7 +898,7 @@ because that doesn't have the prefix or suffix stripped. A bit of massaging is
 required. Also, we only use the match cache for local parts that have not had
 a prefix or suffix stripped. */
 
 required. Also, we only use the match cache for local parts that have not had
 a prefix or suffix stripped. */
 

-if (addr->prefix == NULL && addr->suffix == NULL)
+if (!addr->prefix && !addr->suffix)

   {
   localpart_cache = addr->localpart_cache;
   check_local_part = addr->cc_local_part;
   {
   localpart_cache = addr->localpart_cache;
   check_local_part = addr->cc_local_part;


@@ -896,16 +907,16 @@ else
   {
   localpart_cache = NULL;
   check_local_part = string_copy(addr->cc_local_part);
   {
   localpart_cache = NULL;
   check_local_part = string_copy(addr->cc_local_part);

-  if (addr->prefix != NULL)
+  if (addr->prefix)

     check_local_part += Ustrlen(addr->prefix);
     check_local_part += Ustrlen(addr->prefix);

-  if (addr->suffix != NULL)
+  if (addr->suffix)

     check_local_part[Ustrlen(check_local_part) - Ustrlen(addr->suffix)] = 0;
   }
 
 if ((rc = route_check_dls(r->name, US"local_parts", r->local_parts,
        &localpartlist_anchor, localpart_cache, MCL_LOCALPART,
     check_local_part[Ustrlen(check_local_part) - Ustrlen(addr->suffix)] = 0;
   }
 
 if ((rc = route_check_dls(r->name, US"local_parts", r->local_parts,
        &localpartlist_anchor, localpart_cache, MCL_LOCALPART,

-       check_local_part, &deliver_localpart_data, !r->caseful_local_part,
-       perror)) != OK)
+       check_local_part, CUSS &deliver_localpart_data,
+       !r->caseful_local_part, perror)) != OK)

   return rc;
 
 /* If the check_local_user option is set, check that the local_part is the
   return rc;
 
 /* If the check_local_user option is set, check that the local_part is the


@@ -934,10 +945,10 @@ check_local_user before any subsequent expansions are done. Otherwise, $home
 could mean different things for different options, which would be extremely
 confusing. */
 
 could mean different things for different options, which would be extremely
 confusing. */
 

-if (r->router_home_directory != NULL)
+if (r->router_home_directory)

   {
   uschar *router_home = expand_string(r->router_home_directory);
   {
   uschar *router_home = expand_string(r->router_home_directory);

-  if (router_home == NULL)
+  if (!router_home)

     {
     if (!expand_string_forcedfail)
       {
     {
     if (!expand_string_forcedfail)
       {


@@ -979,9 +990,9 @@ if ((rc = check_files(r->require_files, perror)) != OK)
 
 /* Now the general condition test. */
 
 
 /* Now the general condition test. */
 

-if (r->condition != NULL)
+if (r->condition)

   {
   {

-  DEBUG(D_route) debug_printf("checking \"condition\"\n");
+  DEBUG(D_route) debug_printf("checking \"condition\" \"%.80s\"...\n", r->condition);

   if (!expand_check_condition(r->condition, r->name, US"router"))
     {
     if (search_find_defer)
   if (!expand_check_condition(r->condition, r->name, US"router"))
     {
     if (search_find_defer)


@@ -998,42 +1009,44 @@ if (r->condition != NULL)
 
 #ifdef EXPERIMENTAL_BRIGHTMAIL
 /* check if a specific Brightmail AntiSpam rule fired on the message */
 
 #ifdef EXPERIMENTAL_BRIGHTMAIL
 /* check if a specific Brightmail AntiSpam rule fired on the message */

-if (r->bmi_rule != NULL) {
+if (r->bmi_rule)
+  {

   DEBUG(D_route) debug_printf("checking bmi_rule\n");
   DEBUG(D_route) debug_printf("checking bmi_rule\n");

-  if (bmi_check_rule(bmi_base64_verdict, r->bmi_rule) == 0) {
-    /* none of the rules fired */
+  if (bmi_check_rule(bmi_base64_verdict, r->bmi_rule) == 0)
+    {    /* none of the rules fired */

     DEBUG(D_route)
       debug_printf("%s router skipped: none of bmi_rule rules fired\n", r->name);
     return SKIP;
     DEBUG(D_route)
       debug_printf("%s router skipped: none of bmi_rule rules fired\n", r->name);
     return SKIP;

-  };
-};
+    }
+  }

 
 /* check if message should not be delivered */
 
 /* check if message should not be delivered */

-if (r->bmi_dont_deliver) {
-  if (bmi_deliver == 1) {
-    DEBUG(D_route)
-      debug_printf("%s router skipped: bmi_dont_deliver is FALSE\n", r->name);
-    return SKIP;
-  };
-};
+if (r->bmi_dont_deliver && bmi_deliver == 1)
+  {
+  DEBUG(D_route)
+    debug_printf("%s router skipped: bmi_dont_deliver is FALSE\n", r->name);
+  return SKIP;
+  }

 
 /* check if message should go to an alternate location */
 
 /* check if message should go to an alternate location */

-if (r->bmi_deliver_alternate) {
-  if ((bmi_deliver == 0) || (bmi_alt_location == NULL)) {
-    DEBUG(D_route)
-      debug_printf("%s router skipped: bmi_deliver_alternate is FALSE\n", r->name);
-    return SKIP;
-  };
-};
+if (  r->bmi_deliver_alternate
+   && (bmi_deliver == 0 || !bmi_alt_location)
+   )
+  {
+  DEBUG(D_route)
+    debug_printf("%s router skipped: bmi_deliver_alternate is FALSE\n", r->name);
+  return SKIP;
+  }

 
 /* check if message should go to default location */
 
 /* check if message should go to default location */

-if (r->bmi_deliver_default) {
-  if ((bmi_deliver == 0) || (bmi_alt_location != NULL)) {
-    DEBUG(D_route)
-      debug_printf("%s router skipped: bmi_deliver_default is FALSE\n", r->name);
-    return SKIP;
-  };
-};
+if (  r->bmi_deliver_default
+   && (bmi_deliver == 0 || bmi_alt_location)
+   )
+  {
+  DEBUG(D_route)
+    debug_printf("%s router skipped: bmi_deliver_default is FALSE\n", r->name);
+  return SKIP;
+  }

 #endif
 
 /* All the checks passed. */
 #endif
 
 /* All the checks passed. */


@@ -1079,7 +1092,7 @@ static uschar lastgecos[128];
 static uschar lastshell[128];
 
 BOOL
 static uschar lastshell[128];
 
 BOOL

-route_finduser(uschar *s, struct passwd **pw, uid_t *return_uid)
+route_finduser(const uschar *s, struct passwd **pw, uid_t *return_uid)

 {
 BOOL cache_set = (Ustrcmp(lastname, s) == 0);
 
 {
 BOOL cache_set = (Ustrcmp(lastname, s) == 0);
 


@@ -1090,11 +1103,11 @@ if (!cache_set)
   {
   int i = 0;
 
   {
   int i = 0;
 

-  if (return_uid != NULL && (isdigit(*s) || *s == '-') &&
+  if (return_uid && (isdigit(*s) || *s == '-') &&

        s[Ustrspn(s+1, "0123456789")+1] == 0)
     {
     *return_uid = (uid_t)Uatoi(s);
        s[Ustrspn(s+1, "0123456789")+1] == 0)
     {
     *return_uid = (uid_t)Uatoi(s);

-    if (pw != NULL) *pw = NULL;
+    if (pw) *pw = NULL;

     return TRUE;
     }
 
     return TRUE;
     }
 


@@ -1114,12 +1127,12 @@ if (!cache_set)
   else for (;;)
     {
     errno = 0;
   else for (;;)
     {
     errno = 0;

-    if ((lastpw = getpwnam(CS s)) != NULL) break;
+    if ((lastpw = getpwnam(CS s))) break;

     if (++i > finduser_retries) break;
     sleep(1);
     }
 
     if (++i > finduser_retries) break;
     sleep(1);
     }
 

-  if (lastpw != NULL)
+  if (lastpw)

     {
     pwcopy.pw_uid = lastpw->pw_uid;
     pwcopy.pw_gid = lastpw->pw_gid;
     {
     pwcopy.pw_uid = lastpw->pw_uid;
     pwcopy.pw_gid = lastpw->pw_gid;


@@ -1133,26 +1146,21 @@ if (!cache_set)
     lastpw = &pwcopy;
     }
 
     lastpw = &pwcopy;
     }
 

-  else DEBUG(D_uid)
-    {
-    if (errno != 0) debug_printf("getpwnam(%s) failed: %s\n", s,
-      strerror(errno));
-    }
+  else DEBUG(D_uid) if (errno != 0)
+    debug_printf("getpwnam(%s) failed: %s\n", s, strerror(errno));

   }
 
   }
 

-if (lastpw == NULL)
+if (!lastpw)

   {
   DEBUG(D_uid) debug_printf("getpwnam() returned NULL (user not found)\n");
   return FALSE;
   }
   {
   DEBUG(D_uid) debug_printf("getpwnam() returned NULL (user not found)\n");
   return FALSE;
   }

-else
-  {
-  DEBUG(D_uid) debug_printf("getpwnam() succeeded uid=%d gid=%d\n",
+
+DEBUG(D_uid) debug_printf("getpwnam() succeeded uid=%d gid=%d\n",

     lastpw->pw_uid, lastpw->pw_gid);
     lastpw->pw_uid, lastpw->pw_gid);

-  }

 
 

-if (return_uid != NULL) *return_uid = lastpw->pw_uid;
-if (pw != NULL) *pw = lastpw;
+if (return_uid) *return_uid = lastpw->pw_uid;
+if (pw) *pw = lastpw;

 
 return TRUE;
 }
 
 return TRUE;
 }


@@ -1190,7 +1198,7 @@ if ((isdigit(*s) || *s == '-') && s[Ustrspn(s+1, "0123456789")+1] == 0)
 
 for (;;)
   {
 
 for (;;)
   {

-  if ((gr = getgrnam(CS s)) != NULL)
+  if ((gr = getgrnam(CS s)))

     {
     *return_gid = gr->gr_gid;
     return TRUE;
     {
     *return_gid = gr->gr_gid;
     return TRUE;


@@ -1229,7 +1237,7 @@ route_find_expanded_user(uschar *string, uschar *driver_name,
 {
 uschar *user = expand_string(string);
 
 {
 uschar *user = expand_string(string);
 

-if (user == NULL)
+if (!user)

   {
   *errmsg = string_sprintf("Failed to expand user string \"%s\" for the "
     "%s %s: %s", string, driver_name, driver_type, expand_string_message);
   {
   *errmsg = string_sprintf("Failed to expand user string \"%s\" for the "
     "%s %s: %s", string, driver_name, driver_type, expand_string_message);


@@ -1271,7 +1279,7 @@ route_find_expanded_group(uschar *string, uschar *driver_name, uschar *driver_ty
 BOOL yield = TRUE;
 uschar *group = expand_string(string);
 
 BOOL yield = TRUE;
 uschar *group = expand_string(string);
 

-if (group == NULL)
+if (!group)

   {
   *errmsg = string_sprintf("Failed to expand group string \"%s\" for the "
     "%s %s: %s", string, driver_name, driver_type, expand_string_message);
   {
   *errmsg = string_sprintf("Failed to expand group string \"%s\" for the "
     "%s %s: %s", string, driver_name, driver_type, expand_string_message);


@@ -1292,67 +1300,6 @@ return yield;
 
 
 
 
 
 

-/*************************************************
-*           Sort out "more" or "unseen"          *
-*************************************************/
-
-/* These values are usually fixed boolean values, but they are permitted to be
-expanded strings.
-
-Arguments:
-  addr       address being routed
-  rname      the router name
-  oname      the option name
-  bvalue     the router's boolean value
-  svalue     the router's string value
-  rvalue     where to put the returned value
-
-Returns:     OK     value placed in rvalue
-             DEFER  expansion failed
-*/
-
-static int
-exp_bool(address_item *addr, uschar *rname, uschar *oname, BOOL bvalue,
-  uschar *svalue, BOOL *rvalue)
-{
-uschar *expanded;
-if (svalue == NULL) { *rvalue = bvalue; return OK; }
-
-expanded = expand_string(svalue);
-if (expanded == NULL)
-  {
-  if (expand_string_forcedfail)
-    {
-    DEBUG(D_route) debug_printf("expansion of \"%s\" forced failure\n", oname);
-    *rvalue = bvalue;
-    return OK;
-    }
-  addr->message = string_sprintf("failed to expand \"%s\" in %s router: %s",
-      oname, rname, expand_string_message);
-  DEBUG(D_route) debug_printf("%s\n", addr->message);
-  return DEFER;
-  }
-
-DEBUG(D_route) debug_printf("expansion of \"%s\" yields \"%s\"\n", oname,
-  expanded);
-
-if (strcmpic(expanded, US"true") == 0 || strcmpic(expanded, US"yes") == 0)
-  *rvalue = TRUE;
-else if (strcmpic(expanded, US"false") == 0 || strcmpic(expanded, US"no") == 0)
-  *rvalue = FALSE;
-else
-  {
-  addr->message = string_sprintf("\"%s\" is not a valid value for the "
-    "\"%s\" option in the %s router", expanded, oname, rname);
-  return DEFER;
-  }
-
-return OK;
-}
-
-
-
-

 /*************************************************
 *            Handle an unseen routing            *
 *************************************************/
 /*************************************************
 *            Handle an unseen routing            *
 *************************************************/


@@ -1394,8 +1341,8 @@ from the original address' parent, if present, otherwise unset. */
 
 *parent = *addr;
 parent->child_count = 2;
 
 *parent = *addr;
 parent->child_count = 2;

-parent->p.errors_address =
-  (addr->parent == NULL)? NULL : addr->parent->p.errors_address;
+parent->prop.errors_address =
+  addr->parent ? addr->parent->prop.errors_address : NULL;

 
 /* The routed address gets a new parent. */
 
 
 /* The routed address gets a new parent. */
 


@@ -1406,12 +1353,14 @@ was set from the original parent (or to NULL) - see above. We do NOT want to
 take the errors address from the unseen router. */
 
 new->parent = parent;
 take the errors address from the unseen router. */
 
 new->parent = parent;

-new->p.errors_address = parent->p.errors_address;
+new->prop.errors_address = parent->prop.errors_address;

 
 /* Copy the propagated flags and address_data from the original. */
 
 copyflag(new, addr, af_propagate);
 
 /* Copy the propagated flags and address_data from the original. */
 
 copyflag(new, addr, af_propagate);

-new->p.address_data = addr->p.address_data;
+new->prop.address_data = addr->prop.address_data;
+new->dsn_flags = addr->dsn_flags;
+new->dsn_orcpt = addr->dsn_orcpt;

 
 
 /* As it has turned out, we haven't set headers_add or headers_remove for the
 
 
 /* As it has turned out, we haven't set headers_add or headers_remove for the


@@ -1440,8 +1389,7 @@ delivered. If so, we take it off the relevant queue so that it isn't delivered
 again. Otherwise, it was an alias or something, and the addresses it generated
 are handled in the normal way. */
 
 again. Otherwise, it was an alias or something, and the addresses it generated
 are handled in the normal way. */
 

-if (addr->transport != NULL &&
-    tree_search(tree_nonrecipients, addr->unique) != NULL)
+if (addr->transport && tree_search(tree_nonrecipients, addr->unique))

   {
   DEBUG(D_route)
     debug_printf("\"unseen\" delivery previously done - discarded\n");
   {
   DEBUG(D_route)
     debug_printf("\"unseen\" delivery previously done - discarded\n");


@@ -1487,7 +1435,7 @@ route_address(address_item *addr, address_item **paddr_local,
 int yield = OK;
 BOOL unseen;
 router_instance *r, *nextr;
 int yield = OK;
 BOOL unseen;
 router_instance *r, *nextr;

-uschar *old_domain = addr->domain;
+const uschar *old_domain = addr->domain;

 
 HDEBUG(D_route)
   {
 
 HDEBUG(D_route)
   {


@@ -1499,8 +1447,7 @@ HDEBUG(D_route)
 encounters an error. If the address has start_router set, we begin from there
 instead of at the first router. */
 
 encounters an error. If the address has start_router set, we begin from there
 instead of at the first router. */
 

-for (r = (addr->start_router == NULL)? routers : addr->start_router;
-     r != NULL; r = nextr)
+for (r = addr->start_router ? addr->start_router : routers; r; r = nextr)

   {
   uschar *error;
   struct passwd *pw = NULL;
   {
   uschar *error;
   struct passwd *pw = NULL;


@@ -1512,7 +1459,6 @@ for (r = (addr->start_router == NULL)? routers : addr->start_router;
   int rc;
 
   DEBUG(D_route) debug_printf("--------> %s router <--------\n", r->name);
   int rc;
 
   DEBUG(D_route) debug_printf("--------> %s router <--------\n", r->name);

-  router_name = r->name;

 
   /* Reset any search error message from the previous router. */
 
 
   /* Reset any search error message from the previous router. */
 


@@ -1540,7 +1486,7 @@ for (r = (addr->start_router == NULL)? routers : addr->start_router;
   continally adding to an address, for example), put a long stop counter on
   the number of parents. */
 
   continally adding to an address, for example), put a long stop counter on
   the number of parents. */
 

-  for (parent = addr->parent; parent != NULL; parent = parent->parent)
+  for (parent = addr->parent; parent; parent = parent->parent)

     {
     if (parent->router == r)
       {
     {
     if (parent->router == r)
       {


@@ -1594,7 +1540,7 @@ for (r = (addr->start_router == NULL)? routers : addr->start_router;
   and setting the prefix. Skip the router if the prefix doesn't match,
   unless the prefix is optional. */
 
   and setting the prefix. Skip the router if the prefix doesn't match,
   unless the prefix is optional. */
 

-  if (r->prefix != NULL)
+  if (r->prefix)

     {
     int plen = route_check_prefix(addr->local_part, r->prefix);
     if (plen > 0)
     {
     int plen = route_check_prefix(addr->local_part, r->prefix);
     if (plen > 0)


@@ -1613,7 +1559,7 @@ for (r = (addr->start_router == NULL)? routers : addr->start_router;
 
   /* Handle any configured suffix likewise. */
 
 
   /* Handle any configured suffix likewise. */
 

-  if (r->suffix != NULL)
+  if (r->suffix)

     {
     int slen = route_check_suffix(addr->local_part, r->suffix);
     if (slen > 0)
     {
     int slen = route_check_suffix(addr->local_part, r->suffix);
     if (slen > 0)


@@ -1634,6 +1580,7 @@ for (r = (addr->start_router == NULL)? routers : addr->start_router;
   /* Set the expansion variables now that we have the affixes and the case of
   the local part sorted. */
 
   /* Set the expansion variables now that we have the affixes and the case of
   the local part sorted. */
 

+  router_name = r->name;

   deliver_set_expansions(addr);
 
   /* For convenience, the pre-router checks are in a separate function, which
   deliver_set_expansions(addr);
 
   /* For convenience, the pre-router checks are in a separate function, which


@@ -1641,6 +1588,7 @@ for (r = (addr->start_router == NULL)? routers : addr->start_router;
 
   if ((rc = check_router_conditions(r, addr, verify, &pw, &error)) != OK)
     {
 
   if ((rc = check_router_conditions(r, addr, verify, &pw, &error)) != OK)
     {

+    router_name = NULL;

     if (rc == SKIP) continue;
     addr->message = error;
     yield = rc;
     if (rc == SKIP) continue;
     addr->message = error;
     yield = rc;


@@ -1658,11 +1606,11 @@ for (r = (addr->start_router == NULL)? routers : addr->start_router;
   success, the string is attached to the address for all subsequent processing.
   */
 
   success, the string is attached to the address for all subsequent processing.
   */
 

-  if (r->address_data != NULL)
+  if (r->address_data)

     {
     DEBUG(D_route) debug_printf("processing address_data\n");
     deliver_address_data = expand_string(r->address_data);
     {
     DEBUG(D_route) debug_printf("processing address_data\n");
     deliver_address_data = expand_string(r->address_data);

-    if (deliver_address_data == NULL)
+    if (!deliver_address_data)

       {
       if (expand_string_forcedfail)
         {
       {
       if (expand_string_forcedfail)
         {


@@ -1671,14 +1619,15 @@ for (r = (addr->start_router == NULL)? routers : addr->start_router;
 
         /* Expand "more" if necessary; DEFER => an expansion failed */
 
 
         /* Expand "more" if necessary; DEFER => an expansion failed */
 

-        yield = exp_bool(addr, r->name, US"more", r->more, r->expand_more,
-          &more);
+        yield = exp_bool(addr, US"router", r->name, D_route,
+                       US"more", r->more, r->expand_more, &more);

         if (yield != OK) goto ROUTE_EXIT;
 
         if (!more)
           {
           DEBUG(D_route)
             debug_printf("\"more\"=false: skipping remaining routers\n");
         if (yield != OK) goto ROUTE_EXIT;
 
         if (!more)
           {
           DEBUG(D_route)
             debug_printf("\"more\"=false: skipping remaining routers\n");

+         router_name = NULL;

           r = NULL;
           break;
           }
           r = NULL;
           break;
           }


@@ -1693,7 +1642,7 @@ for (r = (addr->start_router == NULL)? routers : addr->start_router;
         goto ROUTE_EXIT;
         }
       }
         goto ROUTE_EXIT;
         }
       }

-    addr->p.address_data = deliver_address_data;
+    addr->prop.address_data = deliver_address_data;

     }
 
   /* We are finally cleared for take-off with this router. Clear the the flag
     }
 
   /* We are finally cleared for take-off with this router. Clear the the flag


@@ -1704,7 +1653,7 @@ for (r = (addr->start_router == NULL)? routers : addr->start_router;
 
   clearflag(addr, af_local_host_removed);
 
 
   clearflag(addr, af_local_host_removed);
 

-  if (pw != NULL)
+  if (pw)

     {
     pwcopy.pw_name = CS string_copy(US pw->pw_name);
     pwcopy.pw_uid = pw->pw_uid;
     {
     pwcopy.pw_name = CS string_copy(US pw->pw_name);
     pwcopy.pw_uid = pw->pw_uid;


@@ -1717,11 +1666,22 @@ for (r = (addr->start_router == NULL)? routers : addr->start_router;
 
   /* Run the router, and handle the consequences. */
 
 
   /* Run the router, and handle the consequences. */
 

+  /* ... but let us check on DSN before. If this should be the last hop for DSN
+  set flag. */
+
+  if (r->dsn_lasthop && !(addr->dsn_flags & rf_dsnlasthop))
+    {
+    addr->dsn_flags |= rf_dsnlasthop;
+    HDEBUG(D_route) debug_printf("DSN: last hop for %s\n", addr->address);
+    }
+

   HDEBUG(D_route) debug_printf("calling %s router\n", r->name);
 
   yield = (r->info->code)(r, addr, pw, verify, paddr_local, paddr_remote,
     addr_new, addr_succeed);
 
   HDEBUG(D_route) debug_printf("calling %s router\n", r->name);
 
   yield = (r->info->code)(r, addr, pw, verify, paddr_local, paddr_remote,
     addr_new, addr_succeed);
 

+  router_name = NULL;
+

   if (yield == FAIL)
     {
     HDEBUG(D_route) debug_printf("%s router forced address failure\n", r->name);
   if (yield == FAIL)
     {
     HDEBUG(D_route) debug_printf("%s router forced address failure\n", r->name);


@@ -1767,7 +1727,8 @@ for (r = (addr->start_router == NULL)? routers : addr->start_router;
     {
     /* Expand "more" if necessary */
 
     {
     /* Expand "more" if necessary */
 

-    yield = exp_bool(addr, r->name, US"more", r->more, r->expand_more, &more);
+    yield = exp_bool(addr, US"router", r->name, D_route,
+                       US"more", r->more, r->expand_more, &more);

     if (yield != OK) goto ROUTE_EXIT;
 
     if (!more)
     if (yield != OK) goto ROUTE_EXIT;
 
     if (!more)


@@ -1786,16 +1747,16 @@ prematurely, either because a router succeeded, or because of some special
 router response. Note that FAIL errors and errors detected before actually
 running a router go direct to ROUTE_EXIT from code above. */
 
 router response. Note that FAIL errors and errors detected before actually
 running a router go direct to ROUTE_EXIT from code above. */
 

-if (r == NULL)
+if (!r)

   {
   HDEBUG(D_route) debug_printf("no more routers\n");
   {
   HDEBUG(D_route) debug_printf("no more routers\n");

-  if (addr->message == NULL)
+  if (!addr->message)

     {
     uschar *message = US"Unrouteable address";
     {
     uschar *message = US"Unrouteable address";

-    if (addr->router != NULL && addr->router->cannot_route_message != NULL)
+    if (addr->router && addr->router->cannot_route_message)

       {
       uschar *expmessage = expand_string(addr->router->cannot_route_message);
       {
       uschar *expmessage = expand_string(addr->router->cannot_route_message);

-      if (expmessage == NULL)
+      if (!expmessage)

         {
         if (!expand_string_forcedfail)
           log_write(0, LOG_MAIN|LOG_PANIC, "failed to expand "
         {
         if (!expand_string_forcedfail)
           log_write(0, LOG_MAIN|LOG_PANIC, "failed to expand "


@@ -1848,23 +1809,23 @@ networking, so it is included in the binary only if requested. */
 
 #ifdef SUPPORT_TRANSLATE_IP_ADDRESS
 
 
 #ifdef SUPPORT_TRANSLATE_IP_ADDRESS
 

-if (r->translate_ip_address != NULL)
+if (r->translate_ip_address)

   {
   int rc;
   int old_pool = store_pool;
   host_item *h;
   {
   int rc;
   int old_pool = store_pool;
   host_item *h;

-  for (h = addr->host_list; h != NULL; h = h->next)
+  for (h = addr->host_list; h; h = h->next)

     {
     uschar *newaddress;
     uschar *oldaddress, *oldname;
 
     {
     uschar *newaddress;
     uschar *oldaddress, *oldname;
 

-    if (h->address == NULL) continue;
+    if (!h->address) continue;

 
     deliver_host_address = h->address;
     newaddress = expand_string(r->translate_ip_address);
     deliver_host_address = NULL;
 
 
     deliver_host_address = h->address;
     newaddress = expand_string(r->translate_ip_address);
     deliver_host_address = NULL;
 

-    if (newaddress == NULL)
+    if (!newaddress)

       {
       if (expand_string_forcedfail) continue;
       addr->basic_errno = ERRNO_EXPANDFAIL;
       {
       if (expand_string_forcedfail) continue;
       addr->basic_errno = ERRNO_EXPANDFAIL;


@@ -1907,17 +1868,14 @@ if (r->translate_ip_address != NULL)
 /* See if this is an unseen routing; first expand the option if necessary.
 DEFER can be given if the expansion fails */
 
 /* See if this is an unseen routing; first expand the option if necessary.
 DEFER can be given if the expansion fails */
 

-yield = exp_bool(addr, r->name, US"unseen", r->unseen, r->expand_unseen,
-  &unseen);
+yield = exp_bool(addr, US"router", r->name, D_route,
+               US"unseen", r->unseen, r->expand_unseen, &unseen);

 if (yield != OK) goto ROUTE_EXIT;
 
 /* Debugging output recording a successful routing */
 
 if (yield != OK) goto ROUTE_EXIT;
 
 /* Debugging output recording a successful routing */
 

-HDEBUG(D_route)
-  {
-  debug_printf("routed by %s router%s\n", r->name,
+HDEBUG(D_route) debug_printf("routed by %s router%s\n", r->name,

     unseen? " (unseen)" : "");
     unseen? " (unseen)" : "");

-  }

 
 DEBUG(D_route)
   {
 
 DEBUG(D_route)
   {


@@ -1927,16 +1885,17 @@ DEBUG(D_route)
   debug_printf("  transport: %s\n", (addr->transport == NULL)?
     US"<none>" : addr->transport->name);
 
   debug_printf("  transport: %s\n", (addr->transport == NULL)?
     US"<none>" : addr->transport->name);
 

-  if (addr->p.errors_address != NULL)
-    debug_printf("  errors to %s\n", addr->p.errors_address);
+  if (addr->prop.errors_address)
+    debug_printf("  errors to %s\n", addr->prop.errors_address);

 
 

-  for (h = addr->host_list; h != NULL; h = h->next)
+  for (h = addr->host_list; h; h = h->next)

     {
     debug_printf("  host %s", h->name);
     {
     debug_printf("  host %s", h->name);

-    if (h->address != NULL) debug_printf(" [%s]", h->address);
+    if (h->address) debug_printf(" [%s]", h->address);

     if (h->mx >= 0) debug_printf(" MX=%d", h->mx);
       else if (h->mx != MX_NONE) debug_printf(" rgroup=%d", h->mx);
     if (h->port != PORT_NONE) debug_printf(" port=%d", h->port);
     if (h->mx >= 0) debug_printf(" MX=%d", h->mx);
       else if (h->mx != MX_NONE) debug_printf(" rgroup=%d", h->mx);
     if (h->port != PORT_NONE) debug_printf(" port=%d", h->port);

+    if (h->dnssec != DS_UNK) debug_printf(" dnssec=%s", h->dnssec==DS_YES ? "yes" : "no");

     debug_printf("\n");
     }
   }
     debug_printf("\n");
     }
   }


@@ -1945,29 +1904,17 @@ DEBUG(D_route)
 the "unseen" option (ignore if there are no further routers). */
 
 addr->message = NULL;
 the "unseen" option (ignore if there are no further routers). */
 
 addr->message = NULL;

-if (unseen && r->next != NULL)
+if (unseen && r->next)

   route_unseen(r->name, addr, paddr_local, paddr_remote, addr_new);
 
 /* Unset the address expansions, and return the final result. */
 
 ROUTE_EXIT:
   route_unseen(r->name, addr, paddr_local, paddr_remote, addr_new);
 
 /* Unset the address expansions, and return the final result. */
 
 ROUTE_EXIT:

-if (yield == DEFER) {
-  if (
-    ((Ustrstr(addr->message, "failed to expand") != NULL) || (Ustrstr(addr->message, "expansion of ") != NULL)) &&
-    (
-      Ustrstr(addr->message, "mysql") != NULL ||
-      Ustrstr(addr->message, "pgsql") != NULL ||
-      Ustrstr(addr->message, "sqlite") != NULL ||
-      Ustrstr(addr->message, "ldap:") != NULL ||
-      Ustrstr(addr->message, "ldapdn:") != NULL ||
-      Ustrstr(addr->message, "ldapm:") != NULL
-    )
-  ) {
-    addr->message = string_sprintf("Temporary internal error");
-  }
-}
+if (yield == DEFER && addr->message)
+  addr->message = expand_hide_passwords(addr->message);

 
 deliver_set_expansions(NULL);
 
 deliver_set_expansions(NULL);

+router_name = NULL;

 disable_logging = FALSE;
 return yield;
 }
 disable_logging = FALSE;
 return yield;
 }