Callouts: r-verify option to use transport-defined mailfrom

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

diff --git a/src/src/verify.c b/src/src/verify.c
index 82fae89c1632a6a73a1535092b580616d23bd20e..b48d17ee5b6c40b0d4e3e7a86921e2ec26336046 100644 (file)
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -2,9 +2,10 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) The Exim Maintainers 2020 - 2022 */
-/* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 - 2024 */
+/* Copyright (c) University of Cambridge 1995 - 2023 */

 /* See the file NOTICE for conditions of use and distribution. */
 /* See the file NOTICE for conditions of use and distribution. */

+/* SPDX-License-Identifier: GPL-2.0-or-later */

 
 /* Functions concerned with verifying things. The original code for callout
 caching was contributed by Kevin Fleming (but I hacked it around a bit). */
 
 /* Functions concerned with verifying things. The original code for callout
 caching was contributed by Kevin Fleming (but I hacked it around a bit). */


@@ -104,8 +105,8 @@ Return: TRUE if result found
 */
 
 static BOOL
 */
 
 static BOOL

-cached_callout_lookup(address_item * addr, uschar * address_key,
-  uschar * from_address, int * opt_ptr, uschar ** pm_ptr,
+cached_callout_lookup(address_item * addr, const uschar * address_key,
+  const uschar * from_address, int * opt_ptr, uschar ** pm_ptr,

   int * yield, uschar ** failure_ptr,
   dbdata_callout_cache * new_domain_record, int * old_domain_res)
 {
   int * yield, uschar ** failure_ptr,
   dbdata_callout_cache * new_domain_record, int * old_domain_res)
 {


@@ -120,7 +121,7 @@ if (options & vopt_callout_no_cache)
   {
   HDEBUG(D_verify) debug_printf_indent("callout cache: disabled by no_cache\n");
   }
   {
   HDEBUG(D_verify) debug_printf_indent("callout cache: disabled by no_cache\n");
   }

-else if (!(dbm_file = dbfn_open(US"callout", O_RDWR, &dbblock, FALSE, TRUE)))
+else if (!(dbm_file = dbfn_open(US"callout", O_RDWR|O_CREAT, &dbblock, FALSE, TRUE)))

   {
   HDEBUG(D_verify) debug_printf_indent("callout cache: not available\n");
   }
   {
   HDEBUG(D_verify) debug_printf_indent("callout cache: not available\n");
   }


@@ -277,10 +278,10 @@ return FALSE;
 */
 static void
 cache_callout_write(dbdata_callout_cache * dom_rec, const uschar * domain,
 */
 static void
 cache_callout_write(dbdata_callout_cache * dom_rec, const uschar * domain,

-  int done, dbdata_callout_cache_address * addr_rec, uschar * address_key)
+  int done, dbdata_callout_cache_address * addr_rec, const uschar * address_key)

 {
 open_db dbblock;
 {
 open_db dbblock;

-open_db *dbm_file = NULL;
+open_db * dbm_file = NULL;

 
 /* If we get here with done == TRUE, a successful callout happened, and yield
 will be set OK or FAIL according to the response to the RCPT command.
 
 /* If we get here with done == TRUE, a successful callout happened, and yield
 will be set OK or FAIL according to the response to the RCPT command.


@@ -363,10 +364,11 @@ if (addr->transport == cutthrough.addr.transport)
       deliver_host_address = host->address;
       deliver_host_port = host->port;
       deliver_domain = addr->domain;
       deliver_host_address = host->address;
       deliver_host_port = host->port;
       deliver_domain = addr->domain;

-      transport_name = addr->transport->name;
+      transport_name = addr->transport->drinst.name;

 
       host_af = Ustrchr(host->address, ':') ? AF_INET6 : AF_INET;
 
 
       host_af = Ustrchr(host->address, ':') ? AF_INET6 : AF_INET;
 

+      GET_OPTION("interface");

       if (  !smtp_get_interface(tf->interface, host_af, addr, &interface,
              US"callout")
         || !smtp_get_port(tf->port, addr, &port, US"callout")
       if (  !smtp_get_interface(tf->interface, host_af, addr, &interface,
              US"callout")
         || !smtp_get_port(tf->port, addr, &port, US"callout")


@@ -387,6 +389,10 @@ if (addr->transport == cutthrough.addr.transport)
        uschar * resp = NULL;
 
        /* Match!  Send the RCPT TO, set done from the response */
        uschar * resp = NULL;
 
        /* Match!  Send the RCPT TO, set done from the response */

+
+       DEBUG(D_verify)
+         debug_printf("already-open verify connection matches recipient\n");
+

        done =
             smtp_write_command(&ctctx, SCMD_FLUSH, "RCPT TO:<%.1000s>\r\n",
              transport_rcpt_address(addr,
        done =
             smtp_write_command(&ctctx, SCMD_FLUSH, "RCPT TO:<%.1000s>\r\n",
              transport_rcpt_address(addr,


@@ -439,12 +445,25 @@ if (addr->transport == cutthrough.addr.transport)
        }
       break;   /* host_list */
       }
        }
       break;   /* host_list */
       }

-if (!done)
-  cancel_cutthrough_connection(TRUE, US"incompatible connection");

 return done;
 }
 
 
 return done;
 }
 
 

+
+
+/* A rcpt callout, or cached record of one, verified the address.
+Set $domain_data and $local_part_data to detainted versions.
+*/
+static void
+callout_verified_rcpt(const address_item * addr)
+{
+address_item a = {.address = addr->address};
+if (deliver_split_address(&a) != OK) return;
+deliver_localpart_data = string_copy_taint(a.local_part, GET_UNTAINTED);
+deliver_domain_data =    string_copy_taint(a.domain,     GET_UNTAINTED);
+}
+
+

 /*************************************************
 *      Do callout verification for an address    *
 *************************************************/
 /*************************************************
 *      Do callout verification for an address    *
 *************************************************/


@@ -469,9 +488,10 @@ Arguments:
                       vopt_callout_no_cache => don't use callout cache
                       vopt_callout_fullpm => if postmaster check, do full one
                       vopt_callout_random => do the "random" thing
                       vopt_callout_no_cache => don't use callout cache
                       vopt_callout_fullpm => if postmaster check, do full one
                       vopt_callout_random => do the "random" thing

-                      vopt_callout_recipsender => use real sender for recipient
-                      vopt_callout_recippmaster => use postmaster for recipient
-                     vopt_callout_hold         => lazy close connection
+                      vopt_callout_recipsender => use original sender addres
+                      vopt_callout_r_pmaster   => use postmaster as sender
+                     vopt_callout_r_tptsender => use sender defined by tpt
+                     vopt_callout_hold        => lazy close connection

   se_mailfrom         MAIL FROM address for sender verify; NULL => ""
   pm_mailfrom         if non-NULL, do the postmaster check with this sender
 
   se_mailfrom         MAIL FROM address for sender verify; NULL => ""
   pm_mailfrom         if non-NULL, do the postmaster check with this sender
 


@@ -486,11 +506,11 @@ do_callout(address_item *addr, host_item *host_list, transport_feedback *tf,
 int yield = OK;
 int old_domain_cache_result = ccache_accept;
 BOOL done = FALSE;
 int yield = OK;
 int old_domain_cache_result = ccache_accept;
 BOOL done = FALSE;

-uschar *address_key;
-uschar *from_address;
-uschar *random_local_part = NULL;
-const uschar *save_deliver_domain = deliver_domain;
-uschar **failure_ptr = options & vopt_is_recipient
+const uschar * address_key;
+const uschar * from_address;
+uschar * random_local_part = NULL;
+const uschar * save_deliver_domain = deliver_domain;
+uschar ** failure_ptr = options & vopt_is_recipient

   ? &recipient_verify_failure : &sender_verify_failure;
 dbdata_callout_cache new_domain_record;
 dbdata_callout_cache_address new_address_record;
   ? &recipient_verify_failure : &sender_verify_failure;
 dbdata_callout_cache new_domain_record;
 dbdata_callout_cache_address new_address_record;


@@ -503,21 +523,44 @@ new_domain_record.random_result = ccache_unknown;
 memset(&new_address_record, 0, sizeof(new_address_record));
 
 /* For a recipient callout, the key used for the address cache record must
 memset(&new_address_record, 0, sizeof(new_address_record));
 
 /* For a recipient callout, the key used for the address cache record must

-include the sender address if we are using the real sender in the callout,
-because that may influence the result of the callout. */
+include the sender address if we are using anything but a blank sender in the
+callout, because that may influence the result of the callout. */

 
 if (options & vopt_is_recipient)
 
 if (options & vopt_is_recipient)

-  if (options & vopt_callout_recipsender)
-    {
-    from_address = sender_address;
-    address_key = string_sprintf("%s/<%s>", addr->address, sender_address);
-    if (cutthrough.delivery) options |= vopt_callout_no_cache;
-    }
-  else if (options & vopt_callout_recippmaster)
+  if (options & ( vopt_callout_recipsender
+               | vopt_callout_r_tptsender
+               | vopt_callout_r_pmaster)
+     )

     {
     {

-    from_address = string_sprintf("postmaster@%s", qualify_domain_sender);
-    address_key = string_sprintf("%s/<postmaster@%s>", addr->address,
-      qualify_domain_sender);
+    if (options & vopt_callout_recipsender)
+      from_address = sender_address;
+    else if (options & vopt_callout_r_tptsender)
+      {
+      transport_instance * tp = addr->transport;
+      from_address = addr->prop.errors_address
+                 ? addr->prop.errors_address : sender_address;
+      DEBUG(D_verify)
+       debug_printf(" return-path from routed addr: %s\n", from_address);
+
+      GET_OPTION("return_path");
+      if (tp->return_path)
+       {
+       uschar * new_return_path = expand_string(tp->return_path);
+       if (new_return_path)
+         from_address = new_return_path;
+       else if (!f.expand_string_forcedfail)
+         return DEFER;
+       DEBUG(D_verify)
+         debug_printf(" return-path from transport: %s\n", from_address);
+       }
+      }
+    else /* if (options & vopt_callout_recippmaster) */
+      from_address = string_sprintf("postmaster@%s", qualify_domain_sender);
+
+    address_key = string_sprintf("%s/<%s>", addr->address, from_address);
+    addr->return_path = from_address;          /* for cutthrough logging */
+    if (cutthrough.delivery)                   /* cutthrough previously req. */
+      options |= vopt_callout_no_cache;                /* in case called by verify= */

     }
   else
     {
     }
   else
     {


@@ -548,13 +591,12 @@ if (!addr->transport)
   HDEBUG(D_verify) debug_printf("cannot callout via null transport\n");
   }
 
   HDEBUG(D_verify) debug_printf("cannot callout via null transport\n");
   }
 

-else if (Ustrcmp(addr->transport->driver_name, "smtp") != 0)
+else if (Ustrcmp(addr->transport->drinst.driver_name, "smtp") != 0)

   log_write(0, LOG_MAIN|LOG_PANIC|LOG_CONFIG_FOR, "callout transport '%s': %s is non-smtp",
   log_write(0, LOG_MAIN|LOG_PANIC|LOG_CONFIG_FOR, "callout transport '%s': %s is non-smtp",

-    addr->transport->name, addr->transport->driver_name);
+    addr->transport->drinst.name, addr->transport->drinst.driver_name);

 else
   {
 else
   {

-  smtp_transport_options_block *ob =
-    (smtp_transport_options_block *)addr->transport->options_block;
+  smtp_transport_options_block * ob = addr->transport->drinst.options_block;

   smtp_context * sx = NULL;
 
   /* The information wasn't available in the cache, so we have to do a real
   smtp_context * sx = NULL;
 
   /* The information wasn't available in the cache, so we have to do a real


@@ -563,10 +605,14 @@ else
   with a random local part, ensure that such a local part is available. If not,
   log the fact, but carry on without randomising. */
 
   with a random local part, ensure that such a local part is available. If not,
   log the fact, but carry on without randomising. */
 

-  if (options & vopt_callout_random  &&  callout_random_local_part)
-    if (!(random_local_part = expand_string(callout_random_local_part)))
+  if (options & vopt_callout_random)
+    {
+    GET_OPTION("callout_random_local_part");
+    if (  callout_random_local_part
+       && !(random_local_part = expand_string(callout_random_local_part)))

       log_write(0, LOG_MAIN|LOG_PANIC, "failed to expand "
         "callout_random_local_part: %s", expand_string_message);
       log_write(0, LOG_MAIN|LOG_PANIC, "failed to expand "
         "callout_random_local_part: %s", expand_string_message);

+    }

 
   /* Compile regex' used by client-side smtp */
 
 
   /* Compile regex' used by client-side smtp */
 


@@ -596,13 +642,19 @@ that conn for verification purposes (and later delivery also).  Simplest
 coding means skipping this whole loop and doing the append separately.  */
 
   /* Can we re-use an open cutthrough connection? */
 coding means skipping this whole loop and doing the append separately.  */
 
   /* Can we re-use an open cutthrough connection? */

-  if (  cutthrough.cctx.sock >= 0
-     && (options & (vopt_callout_recipsender | vopt_callout_recippmaster))
-       == vopt_callout_recipsender
-     && !random_local_part
-     && !pm_mailfrom
-     )
-    done = cutthrough_multi(addr, host_list, tf, &yield);
+
+  if (cutthrough.cctx.sock >= 0)
+    {
+    if (  !(options & vopt_callout_r_pmaster)
+       && !random_local_part
+       && !pm_mailfrom
+       && Ustrcmp(addr->return_path, cutthrough.addr.return_path) == 0
+       )
+      done = cutthrough_multi(addr, host_list, tf, &yield);
+
+    if (!done)
+      cancel_cutthrough_connection(TRUE, US"incompatible connection");
+    }

 
   /* If we did not use a cached connection, make connections to the hosts
   and do real callouts. The list of hosts is passed in as an argument. */
 
   /* If we did not use a cached connection, make connections to the hosts
   and do real callouts. The list of hosts is passed in as an argument. */


@@ -642,8 +694,9 @@ coding means skipping this whole loop and doing the append separately.  */
     deliver_host_address = host->address;
     deliver_host_port = host->port;
     deliver_domain = addr->domain;
     deliver_host_address = host->address;
     deliver_host_port = host->port;
     deliver_domain = addr->domain;

-    transport_name = addr->transport->name;
+    transport_name = addr->transport->drinst.name;

 
 

+    GET_OPTION("interface");

     if (  !smtp_get_interface(tf->interface, host_af, addr, &interface,
             US"callout")
        || !smtp_get_port(tf->port, addr, &port, US"callout")
     if (  !smtp_get_interface(tf->interface, host_af, addr, &interface,
             US"callout")
        || !smtp_get_port(tf->port, addr, &port, US"callout")


@@ -661,7 +714,7 @@ coding means skipping this whole loop and doing the append separately.  */
     sx->conn_args.interface = interface;
     sx->helo_data = tf->helo_data;
     sx->conn_args.tblock = addr->transport;
     sx->conn_args.interface = interface;
     sx->helo_data = tf->helo_data;
     sx->conn_args.tblock = addr->transport;

-    sx->conn_args.sock = -1;
+    sx->cctx.sock = sx->conn_args.sock = -1;

     sx->verify = TRUE;
 
 tls_retry_connection:
     sx->verify = TRUE;
 
 tls_retry_connection:


@@ -692,7 +745,33 @@ tls_retry_connection:
 #endif
     if (yield != OK)
       {
 #endif
     if (yield != OK)
       {

+      smtp_debug_cmd_report(); /*XXX we seem to exit without what should
+                               be a common call to this.  How? */

       errno = addr->basic_errno;
       errno = addr->basic_errno;

+
+      /* For certain errors we want specifically to log the transport name,
+      for ease of fixing config errors. Slightly ugly doing it here, but we want
+      to not leak that also in the SMTP response. */
+      switch (errno)
+       {
+       case EPROTOTYPE:
+       case ENOPROTOOPT:
+       case EPROTONOSUPPORT:
+       case ESOCKTNOSUPPORT:
+       case EOPNOTSUPP:
+       case EPFNOSUPPORT:
+       case EAFNOSUPPORT:
+       case EADDRINUSE:
+       case EADDRNOTAVAIL:
+       case ENETDOWN:
+       case ENETUNREACH:
+         log_write(0, LOG_MAIN|LOG_PANIC,
+           "%s verify %s (making calloout connection): T=%s %s",
+           options & vopt_is_recipient ? "sender" : "recipient",
+           yield == FAIL ? "fail" : "defer",
+           transport_name, strerror(errno));
+       }
+

       transport_name = NULL;
       deliver_host = deliver_host_address = NULL;
       deliver_domain = save_deliver_domain;
       transport_name = NULL;
       deliver_host = deliver_host_address = NULL;
       deliver_domain = save_deliver_domain;


@@ -723,6 +802,7 @@ tls_retry_connection:
     sx->send_rset = TRUE;
     sx->completed_addr = FALSE;
 
     sx->send_rset = TRUE;
     sx->completed_addr = FALSE;
 

+/*XXX do not want to write a cache record for ATRN */

     new_domain_record.result = old_domain_cache_result == ccache_reject_mfnull
       ? ccache_reject_mfnull : ccache_accept;
 
     new_domain_record.result = old_domain_cache_result == ccache_reject_mfnull
       ? ccache_reject_mfnull : ccache_accept;
 


@@ -731,7 +811,7 @@ tls_retry_connection:
 
     if (random_local_part)
       {
 
     if (random_local_part)
       {

-      uschar * main_address = addr->address;
+      const uschar * main_address = addr->address;

       const uschar * rcpt_domain = addr->domain;
 
 #ifdef SUPPORT_I18N
       const uschar * rcpt_domain = addr->domain;
 
 #ifdef SUPPORT_I18N


@@ -783,7 +863,7 @@ tls_retry_connection:
       /* Remember when we last did a random test */
       new_domain_record.random_stamp = time(NULL);
 
       /* Remember when we last did a random test */
       new_domain_record.random_stamp = time(NULL);
 

-      if (smtp_write_mail_and_rcpt_cmds(sx, &yield) == 0)
+      if (smtp_write_mail_and_rcpt_cmds(sx, &yield) == sw_mrc_ok)

        switch(addr->transport_return)
          {
          case PENDING_OK:      /* random was accepted, unfortunately */
        switch(addr->transport_return)
          {
          case PENDING_OK:      /* random was accepted, unfortunately */


@@ -843,7 +923,7 @@ tls_retry_connection:
     /* Main verify.  For rcpt-verify use SIZE if we know it and we're not cacheing;
     for sndr-verify never use it. */
 
     /* Main verify.  For rcpt-verify use SIZE if we know it and we're not cacheing;
     for sndr-verify never use it. */
 

-    if (done)
+    if (done && !(options & vopt_atrn))

       {
       if (!(options & vopt_is_recipient  &&  options & vopt_callout_no_cache))
        sx->avoid_option = OPTION_SIZE;
       {
       if (!(options & vopt_is_recipient  &&  options & vopt_callout_no_cache))
        sx->avoid_option = OPTION_SIZE;


@@ -851,33 +931,34 @@ tls_retry_connection:
       done = FALSE;
       switch(smtp_write_mail_and_rcpt_cmds(sx, &yield))
        {
       done = FALSE;
       switch(smtp_write_mail_and_rcpt_cmds(sx, &yield))
        {

-       case 0:  switch(addr->transport_return) /* ok so far */
-                   {
-                   case PENDING_OK:  done = TRUE;
-                                     new_address_record.result = ccache_accept;
-                                     break;
-                   case FAIL:        done = TRUE;
-                                     yield = FAIL;
-                                     *failure_ptr = US"recipient";
-                                     new_address_record.result = ccache_reject;
-                                     break;
-                   default:          break;
-                   }
-                 break;
+       case sw_mrc_ok:
+         switch(addr->transport_return)        /* ok so far */
+           {
+           case PENDING_OK:  done = TRUE;
+                             new_address_record.result = ccache_accept;
+                             break;
+           case FAIL:        done = TRUE;
+                             yield = FAIL;
+                             *failure_ptr = US"recipient";
+                             new_address_record.result = ccache_reject;
+                             break;
+           default:          break;
+           }
+         break;

 
 

-       case -1:                                /* MAIL response error */
-                 *failure_ptr = US"mail";
-                 if (errno == 0 && sx->buffer[0] == '5')
-                   {
-                   setflag(addr, af_verify_nsfail);
-                   if (from_address[0] == 0)
-                     new_domain_record.result = ccache_reject_mfnull;
-                   }
-                 break;
-                                               /* non-MAIL read i/o error */
-                                               /* non-MAIL response timeout */
-                                               /* internal error; channel still usable */
-       default:  break;                        /* transmit failed */
+       case sw_mrc_bad_mail:                   /* MAIL response error */
+         *failure_ptr = US"mail";
+         if (errno == 0 && sx->buffer[0] == '5')
+           {
+           setflag(addr, af_verify_nsfail);
+           if (from_address[0] == 0)
+             new_domain_record.result = ccache_reject_mfnull;
+           }
+         break;
+                                       /* non-MAIL read i/o error */
+                                       /* non-MAIL response timeout */
+                                       /* internal error; channel still usable */
+       default:  break;                /* transmit failed */

        }
       }
 
        }
       }
 


@@ -902,7 +983,7 @@ tls_retry_connection:
 
       if (done)
        {
 
       if (done)
        {

-       uschar * main_address = addr->address;
+       const uschar * main_address = addr->address;

 
        /*XXX oops, affixes */
        addr->address = string_sprintf("postmaster@%.1000s", addr->domain);
 
        /*XXX oops, affixes */
        addr->address = string_sprintf("postmaster@%.1000s", addr->domain);


@@ -915,7 +996,7 @@ tls_retry_connection:
        sx->completed_addr = FALSE;
        sx->avoid_option = OPTION_SIZE;
 
        sx->completed_addr = FALSE;
        sx->avoid_option = OPTION_SIZE;
 

-       if(  smtp_write_mail_and_rcpt_cmds(sx, &yield) == 0
+       if(  smtp_write_mail_and_rcpt_cmds(sx, &yield) == sw_mrc_ok

          && addr->transport_return == PENDING_OK
          )
          done = TRUE;
          && addr->transport_return == PENDING_OK
          )
          done = TRUE;


@@ -1040,6 +1121,8 @@ no_conn:
         HDEBUG(D_acl|D_v) debug_printf("Cutthrough cancelled by presence of transport filter\n");
         }
 #ifndef DISABLE_DKIM
         HDEBUG(D_acl|D_v) debug_printf("Cutthrough cancelled by presence of transport filter\n");
         }
 #ifndef DISABLE_DKIM

+      /* DKIM signing needs to add a header after seeing the whole body, so we cannot just copy
+      body bytes to the outbound as they are received, which is the intent of cutthrough. */

       if (ob->dkim.dkim_domain)
         {
         cutthrough.delivery= FALSE;
       if (ob->dkim.dkim_domain)
         {
         cutthrough.delivery= FALSE;


@@ -1059,8 +1142,7 @@ no_conn:
        && rcpt_count == 1
        && done
        && yield == OK
        && rcpt_count == 1
        && done
        && yield == OK

-       &&    (options & (vopt_callout_recipsender|vopt_callout_recippmaster|vopt_success_on_redirect))
-          == vopt_callout_recipsender
+       && !(options & (vopt_callout_r_pmaster| vopt_success_on_redirect))

        && !random_local_part
        && !pm_mailfrom
        && cutthrough.cctx.sock < 0
        && !random_local_part
        && !pm_mailfrom
        && cutthrough.cctx.sock < 0


@@ -1076,7 +1158,7 @@ no_conn:
       /* We assume no buffer in use in the outblock */
       cutthrough.cctx =                sx->cctx;
       cutthrough.nrcpt =       1;
       /* We assume no buffer in use in the outblock */
       cutthrough.cctx =                sx->cctx;
       cutthrough.nrcpt =       1;

-      cutthrough.transport =   addr->transport->name;
+      cutthrough.transport =   addr->transport->drinst.name;

       cutthrough.interface =   interface;
       cutthrough.snd_port =    sending_port;
       cutthrough.peer_options =        smtp_peer_options;
       cutthrough.interface =   interface;
       cutthrough.snd_port =    sending_port;
       cutthrough.peer_options =        smtp_peer_options;


@@ -1108,9 +1190,9 @@ no_conn:
     else
       {
       /* Ensure no cutthrough on multiple verifies that were incompatible */
     else
       {
       /* Ensure no cutthrough on multiple verifies that were incompatible */

-      if (options & vopt_callout_recipsender)
+      if (options & (vopt_callout_recipsender | vopt_callout_r_tptsender))

         cancel_cutthrough_connection(TRUE, US"not usable for cutthrough");
         cancel_cutthrough_connection(TRUE, US"not usable for cutthrough");

-      if (sx->send_quit)
+      if (sx->send_quit && sx->cctx.sock >= 0)

        if (smtp_write_command(sx, SCMD_FLUSH, "QUIT\r\n") != -1)
          /* Wait a short time for response, and discard it */
          smtp_read_response(sx, sx->buffer, sizeof(sx->buffer), '2', 1);
        if (smtp_write_command(sx, SCMD_FLUSH, "QUIT\r\n") != -1)
          /* Wait a short time for response, and discard it */
          smtp_read_response(sx, sx->buffer, sizeof(sx->buffer), '2', 1);


@@ -1182,7 +1264,8 @@ if (!done)
 /* Come here from within the cache-reading code on fast-track exit. */
 
 END_CALLOUT:
 /* Come here from within the cache-reading code on fast-track exit. */
 
 END_CALLOUT:

-tls_modify_variables(&tls_in); /* return variables to inbound values */
+if (!(options & vopt_atrn))
+  tls_modify_variables(&tls_in);       /* return variables to inbound values */

 return yield;
 }
 
 return yield;
 }
 


@@ -1192,10 +1275,10 @@ return yield;
    one was requested and a recipient-verify wasn't subsequently done.
 */
 int
    one was requested and a recipient-verify wasn't subsequently done.
 */
 int

-open_cutthrough_connection(address_item * addr)
+open_cutthrough_connection(address_item * addr, BOOL transport_sender)

 {
 address_item addr2;
 {
 address_item addr2;

-int rc;
+int vopt, rc;

 
 /* Use a recipient-verify-callout to set up the cutthrough connection. */
 /* We must use a copy of the address for verification, because it might
 
 /* Use a recipient-verify-callout to set up the cutthrough connection. */
 /* We must use a copy of the address for verification, because it might


@@ -1204,9 +1287,12 @@ get rewritten. */
 addr2 = *addr;
 HDEBUG(D_acl) debug_printf_indent("----------- %s cutthrough setup ------------\n",
   rcpt_count > 1 ? "more" : "start");
 addr2 = *addr;
 HDEBUG(D_acl) debug_printf_indent("----------- %s cutthrough setup ------------\n",
   rcpt_count > 1 ? "more" : "start");

-rc = verify_address(&addr2, NULL,
-       vopt_is_recipient | vopt_callout_recipsender | vopt_callout_no_cache,
-       CUTTHROUGH_CMD_TIMEOUT, -1, -1,
+
+vopt = transport_sender
+  ? vopt_is_recipient | vopt_callout_r_tptsender | vopt_callout_no_cache
+  : vopt_is_recipient | vopt_callout_recipsender | vopt_callout_no_cache;
+
+rc = verify_address(&addr2, NULL, vopt, CUTTHROUGH_CMD_TIMEOUT, -1, -1,

        NULL, NULL, NULL);
 addr->message = addr2.message;
 addr->user_message = addr2.user_message;
        NULL, NULL, NULL);
 addr->message = addr2.message;
 addr->user_message = addr2.user_message;


@@ -1244,7 +1330,7 @@ return FALSE;
 
 
 static BOOL
 
 
 static BOOL

-_cutthrough_puts(uschar * cp, int n)
+_cutthrough_puts(const uschar * cp, int n)

 {
 while(n--)
  {
 {
 while(n--)
  {


@@ -1259,7 +1345,7 @@ return TRUE;
 
 /* Buffered output of counted data block.   Return boolean success */
 static BOOL
 
 /* Buffered output of counted data block.   Return boolean success */
 static BOOL

-cutthrough_puts(uschar * cp, int n)
+cutthrough_puts(const uschar * cp, int n)

 {
 if (cutthrough.cctx.sock < 0) return TRUE;
 if (_cutthrough_puts(cp, n))  return TRUE;
 {
 if (cutthrough.cctx.sock < 0) return TRUE;
 if (_cutthrough_puts(cp, n))  return TRUE;


@@ -1311,7 +1397,13 @@ cutthrough_data_puts(US"\r\n", 2);
 }
 
 
 }
 
 

-/* Get and check response from cutthrough target */
+/* Get and check response from cutthrough target.
+Used for
+- nonfirst RCPT
+- predata
+- data finaldot
+- cutthrough conn close
+*/

 static uschar
 cutthrough_response(client_conn_ctx * cctx, char expect, uschar ** copy, int timeout)
 {
 static uschar
 cutthrough_response(client_conn_ctx * cctx, char expect, uschar ** copy, int timeout)
 {


@@ -1325,7 +1417,7 @@ sx.inblock.ptr = inbuffer;
 sx.inblock.ptrend = inbuffer;
 sx.inblock.cctx = cctx;
 if(!smtp_read_response(&sx, responsebuffer, sizeof(responsebuffer), expect, timeout))
 sx.inblock.ptrend = inbuffer;
 sx.inblock.cctx = cctx;
 if(!smtp_read_response(&sx, responsebuffer, sizeof(responsebuffer), expect, timeout))

-  cancel_cutthrough_connection(TRUE, US"target timeout on read");
+  cancel_cutthrough_connection(TRUE, US"unexpected response to smtp command");

 
 if(copy)
   {
 
 if(copy)
   {


@@ -1359,9 +1451,9 @@ return cutthrough_response(&cutthrough.cctx, '3', NULL, CUTTHROUGH_DATA_TIMEOUT)
 
 /* tctx arg only to match write_chunk() */
 static BOOL
 
 /* tctx arg only to match write_chunk() */
 static BOOL

-cutthrough_write_chunk(transport_ctx * tctx, uschar * s, int len)
+cutthrough_write_chunk(transport_ctx * tctx, const uschar * s, int len)

 {
 {

-uschar * s2;
+const uschar * s2;

 while(s && (s2 = Ustrchr(s, '\n')))
  {
  if(!cutthrough_puts(s, s2-s) || !cutthrough_put_nl())
 while(s && (s2 = Ustrchr(s, '\n')))
  {
  if(!cutthrough_puts(s, s2-s) || !cutthrough_put_nl())


@@ -1613,9 +1705,10 @@ Arguments:
 
                      vopt_callout_fullpm => if postmaster check, do full one
                      vopt_callout_no_cache => don't use callout cache
 
                      vopt_callout_fullpm => if postmaster check, do full one
                      vopt_callout_no_cache => don't use callout cache

-                     vopt_callout_random => do the "random" thing
-                     vopt_callout_recipsender => use real sender for recipient
+                     vopt_callout_random   => do the "random" thing
+                     vopt_callout_recipsender  => use real sender for recipient

                      vopt_callout_recippmaster => use postmaster for recipient
                      vopt_callout_recippmaster => use postmaster for recipient

+                    vopt_callout_r_tptsender  => use sender as defined by tpt

 
   callout          if > 0, specifies that callout is required, and gives timeout
                      for individual commands
 
   callout          if > 0, specifies that callout is required, and gives timeout
                      for individual commands


@@ -1649,16 +1742,12 @@ int yield = OK;
 int verify_type = expn ? v_expn :
    f.address_test_mode ? v_none :
           options & vopt_is_recipient ? v_recipient : v_sender;
 int verify_type = expn ? v_expn :
    f.address_test_mode ? v_none :
           options & vopt_is_recipient ? v_recipient : v_sender;

-address_item *addr_list;
-address_item *addr_new = NULL;
-address_item *addr_remote = NULL;
-address_item *addr_local = NULL;
-address_item *addr_succeed = NULL;
-uschar **failure_ptr = options & vopt_is_recipient
+address_item * addr_list, * addr_new = NULL, * addr_remote = NULL;
+address_item * addr_local = NULL, * addr_succeed = NULL;
+uschar ** failure_ptr = options & vopt_is_recipient

   ? &recipient_verify_failure : &sender_verify_failure;
   ? &recipient_verify_failure : &sender_verify_failure;

-uschar *ko_prefix, *cr;
-uschar *address = vaddr->address;
-uschar *save_sender;
+uschar * ko_prefix, * cr;
+const uschar * address = vaddr->address, * save_sender;

 uschar null_sender[] = { 0 };             /* Ensure writeable memory */
 
 /* Clear, just in case */
 uschar null_sender[] = { 0 };             /* Ensure writeable memory */
 
 /* Clear, just in case */


@@ -1703,9 +1792,8 @@ may have been set by domains and local part tests during an ACL. */
 
 if (global_rewrite_rules)
   {
 
 if (global_rewrite_rules)
   {

-  uschar *old = address;
-  /* deconst ok as address was not const */
-  address = US rewrite_address(address, options & vopt_is_recipient, FALSE,
+  const uschar * old = address;
+  address = rewrite_address(address, options & vopt_is_recipient, FALSE,

     global_rewrite_rules, rewrite_existflags);
   if (address != old)
     {
     global_rewrite_rules, rewrite_existflags);
   if (address != old)
     {


@@ -1797,7 +1885,7 @@ while (addr_new)
         fprintf(fp, "\n*** Error in setting up pipe, file, or autoreply:\n"
           "%s\n", addr->message);
       else if (allow)
         fprintf(fp, "\n*** Error in setting up pipe, file, or autoreply:\n"
           "%s\n", addr->message);
       else if (allow)

-        fprintf(fp, "\n  transport = %s\n", addr->transport->name);
+        fprintf(fp, "\n  transport = %s\n", addr->transport->drinst.name);

       else
         fprintf(fp, " *** forbidden ***\n");
       }
       else
         fprintf(fp, " *** forbidden ***\n");
       }


@@ -1860,7 +1948,9 @@ while (addr_new)
       sending a message to this address. */
 
       if ((tp = addr->transport))
       sending a message to this address. */
 
       if ((tp = addr->transport))

-       if (!tp->info->local)
+       {
+       transport_info * ti = tp->drinst.info;
+       if (!ti->local)

          {
          (void)(tp->setup)(tp, addr, &tf, 0, 0, NULL);
 
          {
          (void)(tp->setup)(tp, addr, &tf, 0, 0, NULL);
 


@@ -1871,8 +1961,8 @@ while (addr_new)
          if (tf.hosts && (!host_list || tf.hosts_override))
            {
            uschar *s;
          if (tf.hosts && (!host_list || tf.hosts_override))
            {
            uschar *s;

-           const uschar *save_deliver_domain = deliver_domain;
-           uschar *save_deliver_localpart = deliver_localpart;
+           const uschar * save_deliver_domain = deliver_domain;
+           const uschar * save_deliver_localpart = deliver_localpart;

 
            host_list = NULL;    /* Ignore the router's hosts */
 
 
            host_list = NULL;    /* Ignore the router's hosts */
 


@@ -1886,7 +1976,7 @@ while (addr_new)
              {
              log_write(0, LOG_MAIN|LOG_PANIC, "failed to expand list of hosts "
                "\"%s\" in %s transport for callout: %s", tf.hosts,
              {
              log_write(0, LOG_MAIN|LOG_PANIC, "failed to expand list of hosts "
                "\"%s\" in %s transport for callout: %s", tf.hosts,

-               tp->name, expand_string_message);
+               tp->drinst.name, expand_string_message);

              }
            else
              {
              }
            else
              {


@@ -1912,10 +2002,9 @@ while (addr_new)
                else
                  {
                  const dnssec_domains * dsp = NULL;
                else
                  {
                  const dnssec_domains * dsp = NULL;

-                 if (Ustrcmp(tp->driver_name, "smtp") == 0)
+                 if (Ustrcmp(tp->drinst.driver_name, "smtp") == 0)

                    {
                    {

-                   smtp_transport_options_block * ob =
-                       (smtp_transport_options_block *) tp->options_block;
+                   smtp_transport_options_block * ob = tp->drinst.options_block;

                    dsp = &ob->dnssec;
                    }
 
                    dsp = &ob->dnssec;
                    }
 


@@ -1927,15 +2016,17 @@ while (addr_new)
            }
          }
        else if (  options & vopt_quota
            }
          }
        else if (  options & vopt_quota

-               && Ustrcmp(tp->driver_name, "appendfile") == 0)
+               && Ustrcmp(tp->drinst.driver_name, "appendfile") == 0)

          local_verify = TRUE;
          local_verify = TRUE;

+       }

 
       /* Can only do a callout if we have at least one host! If the callout
       fails, it will have set ${sender,recipient}_verify_failure. */
 
       if (host_list)
         {
 
       /* Can only do a callout if we have at least one host! If the callout
       fails, it will have set ${sender,recipient}_verify_failure. */
 
       if (host_list)
         {

-        HDEBUG(D_verify) debug_printf("Attempting full verification using callout\n");
+        HDEBUG(D_verify)
+         debug_printf("Attempting full verification using callout\n");

         if (host_checking && !f.host_checking_callout)
           {
           HDEBUG(D_verify)
         if (host_checking && !f.host_checking_callout)
           {
           HDEBUG(D_verify)


@@ -1944,14 +2035,17 @@ while (addr_new)
           }
         else
           {
           }
         else
           {

-#ifndef DISABLE_TLS

          deliver_set_expansions(addr);
          deliver_set_expansions(addr);

-#endif

           rc = do_callout(addr, host_list, &tf, callout, callout_overall,
             callout_connect, options, se_mailfrom, pm_mailfrom);
           rc = do_callout(addr, host_list, &tf, callout, callout_overall,
             callout_connect, options, se_mailfrom, pm_mailfrom);

-#ifndef DISABLE_TLS

          deliver_set_expansions(NULL);
          deliver_set_expansions(NULL);

-#endif
+
+         if (  options & vopt_is_recipient
+            && rc == OK
+                        /* set to "random", with OK, for an accepted random */
+            && !recipient_verify_failure
+            )
+           callout_verified_rcpt(addr);

           }
         }
       else if (local_verify)
           }
         }
       else if (local_verify)


@@ -2147,7 +2241,7 @@ if (allok && !addr_local && !addr_remote)
 for (addr_list = addr_local, i = 0; i < 2; addr_list = addr_remote, i++)
   while (addr_list)
     {
 for (addr_list = addr_local, i = 0; i < 2; addr_list = addr_remote, i++)
   while (addr_list)
     {

-    address_item *addr = addr_list;
+    address_item * addr = addr_list;

     transport_instance * tp = addr->transport;
 
     addr_list = addr->next;
     transport_instance * tp = addr->transport;
 
     addr_list = addr->next;


@@ -2173,13 +2267,14 @@ for (addr_list = addr_local, i = 0; i < 2; addr_list = addr_remote, i++)
     /* Show router, and transport */
 
     fprintf(fp, "router = %s, transport = %s\n",
     /* Show router, and transport */
 
     fprintf(fp, "router = %s, transport = %s\n",

-      addr->router->name, tp ? tp->name : US"unset");
+      addr->router->drinst.name, tp ? tp->drinst.name : US"unset");

 
     /* Show any hosts that are set up by a router unless the transport
     is going to override them; fiddle a bit to get a nice format. */
 
     if (addr->host_list && tp && !tp->overrides_hosts)
       {
 
     /* Show any hosts that are set up by a router unless the transport
     is going to override them; fiddle a bit to get a nice format. */
 
     if (addr->host_list && tp && !tp->overrides_hosts)
       {

+      transport_info * ti = tp->drinst.info;

       int maxlen = 0;
       int maxaddlen = 0;
       for (host_item * h = addr->host_list; h; h = h->next)
       int maxlen = 0;
       int maxaddlen = 0;
       for (host_item * h = addr->host_list; h; h = h->next)


@@ -2195,7 +2290,7 @@ for (addr_list = addr_local, i = 0; i < 2; addr_list = addr_remote, i++)
 
        if (h->address)
          fprintf(fp, "[%s%-*c", h->address, maxaddlen+1 - Ustrlen(h->address), ']');
 
        if (h->address)
          fprintf(fp, "[%s%-*c", h->address, maxaddlen+1 - Ustrlen(h->address), ']');

-       else if (tp->info->local)
+       else if (ti->local)

          fprintf(fp, " %-*s ", maxaddlen, "");  /* Omit [unknown] for local */
        else
          fprintf(fp, "[%s%-*c", "unknown", maxaddlen+1 - 7, ']');
          fprintf(fp, " %-*s ", maxaddlen, "");  /* Omit [unknown] for local */
        else
          fprintf(fp, "[%s%-*c", "unknown", maxaddlen+1 - 7, ']');


@@ -2214,7 +2309,8 @@ the -bv or -bt case). */
 
 out:
 verify_mode = NULL;
 
 out:
 verify_mode = NULL;

-tls_modify_variables(&tls_in); /* return variables to inbound values */
+if (!(options & vopt_atrn))
+  tls_modify_variables(&tls_in);       /* return variables to inbound values */

 
 return yield;
 }
 
 return yield;
 }


@@ -2401,11 +2497,11 @@ verify_check_notblind(BOOL case_sensitive)
 for (int i = 0; i < recipients_count; i++)
   {
   BOOL found = FALSE;
 for (int i = 0; i < recipients_count; i++)
   {
   BOOL found = FALSE;

-  uschar *address = recipients_list[i].address;
+  const uschar * address = recipients_list[i].address;

 
   for (header_line * h = header_list; !found && h; h = h->next)
     {
 
   for (header_line * h = header_list; !found && h; h = h->next)
     {

-    uschar *colon, *s;
+    uschar * colon, * s;

 
     if (h->type != htype_to && h->type != htype_cc) continue;
 
 
     if (h->type != htype_to && h->type != htype_cc) continue;
 


@@ -2479,7 +2575,7 @@ Returns:     pointer to an address item, or NULL
 */
 
 address_item *
 */
 
 address_item *

-verify_checked_sender(uschar *sender)
+verify_checked_sender(const uschar * sender)

 {
 for (address_item * addr = sender_verified_list; addr; addr = addr->next)
   if (Ustrcmp(sender, addr->address) == 0) return addr;
 {
 for (address_item * addr = sender_verified_list; addr; addr = addr->next)
   if (Ustrcmp(sender, addr->address) == 0) return addr;


@@ -2552,12 +2648,12 @@ for (int i = 0; i < 3 && !done; i++)
 
     f.parse_allow_group = TRUE;
 
 
     f.parse_allow_group = TRUE;
 

-    while (*s != 0)
+    while (*s)

       {
       {

-      address_item *vaddr;
+      address_item * vaddr;

 
       while (isspace(*s) || *s == ',') s++;
 
       while (isspace(*s) || *s == ',') s++;

-      if (*s == 0) break;        /* End of header */
+      if (!*s) break;                  /* End of header */

 
       ss = parse_find_address_end(s, FALSE);
 
 
       ss = parse_find_address_end(s, FALSE);
 


@@ -2568,7 +2664,7 @@ for (int i = 0; i < 3 && !done; i++)
 
       while (isspace(ss[-1])) ss--;
       terminator = *ss;
 
       while (isspace(ss[-1])) ss--;
       terminator = *ss;

-      *ss = 0;
+      *ss = '\0';

 
       HDEBUG(D_verify) debug_printf("verifying %.*s header address %s\n",
         (int)(endname - h->text), h->text, s);
 
       HDEBUG(D_verify) debug_printf("verifying %.*s header address %s\n",
         (int)(endname - h->text), h->text, s);


@@ -2813,17 +2909,17 @@ if (sscanf(CS buffer + qlen, "%d , %d%n", &received_sender_port,
   goto END_OFF;
 
 p = buffer + qlen + n;
   goto END_OFF;
 
 p = buffer + qlen + n;

-while(isspace(*p)) p++;
+Uskip_whitespace(&p);

 if (*p++ != ':') goto END_OFF;
 if (*p++ != ':') goto END_OFF;

-while(isspace(*p)) p++;
+Uskip_whitespace(&p);

 if (Ustrncmp(p, "USERID", 6) != 0) goto END_OFF;
 p += 6;
 if (Ustrncmp(p, "USERID", 6) != 0) goto END_OFF;
 p += 6;

-while(isspace(*p)) p++;
+Uskip_whitespace(&p);

 if (*p++ != ':') goto END_OFF;
 if (*p++ != ':') goto END_OFF;

-while (*p != 0 && *p != ':') p++;
-if (*p++ == 0) goto END_OFF;
-while(isspace(*p)) p++;
-if (*p == 0) goto END_OFF;
+while (*p && *p != ':') p++;
+if (!*p++) goto END_OFF;
+Uskip_whitespace(&p);
+if (!*p) goto END_OFF;

 
 /* The rest of the line is the data we want. We turn it into printing
 characters when we save it, so that it cannot mess up the format of any logging
 
 /* The rest of the line is the data we want. We turn it into printing
 characters when we save it, so that it cannot mess up the format of any logging


@@ -2918,7 +3014,7 @@ if (*ss == '@')
 a (possibly masked) comparison with the current IP address. */
 
 if (string_is_ip_address(ss, &maskoffset) != 0)
 a (possibly masked) comparison with the current IP address. */
 
 if (string_is_ip_address(ss, &maskoffset) != 0)

-  return (host_is_in_net(cb->host_address, ss, maskoffset)? OK : FAIL);
+  return host_is_in_net(cb->host_address, ss, maskoffset) ? OK : FAIL;

 
 /* The pattern is not an IP address. A common error that people make is to omit
 one component of an IPv4 address, either by accident, or believing that, for
 
 /* The pattern is not an IP address. A common error that people make is to omit
 one component of an IPv4 address, either by accident, or believing that, for


@@ -2929,13 +3025,25 @@ ancient specification.) To aid in debugging these cases, we give a specific
 error if the pattern contains only digits and dots or contains a slash preceded
 only by digits and dots (a slash at the start indicates a file name and of
 course slashes may be present in lookups, but not preceded only by digits and
 error if the pattern contains only digits and dots or contains a slash preceded
 only by digits and dots (a slash at the start indicates a file name and of
 course slashes may be present in lookups, but not preceded only by digits and

-dots). */
+dots).  Then the equivalent for IPv6 (roughly). */

 
 

-for (t = ss; isdigit(*t) || *t == '.'; ) t++;
-if (!*t  || (*t == '/' && t != ss))
+if (Ustrchr(ss, ':'))

   {
   {

-  *error = US"malformed IPv4 address or address mask";
-  return ERROR;
+  for (t = ss; isxdigit(*t) || *t == ':' || *t == '.'; ) t++;
+  if (!*t  ||  (*t == '/' || *t == '%') && t != ss)
+    {
+    *error = string_sprintf("malformed IPv6 address or address mask: %.*s", (int)(t - ss), ss);
+    return ERROR;
+    }
+  }
+else
+  {
+  for (t = ss; isdigit(*t) || *t == '.'; ) t++;
+  if (!*t  || (*t == '/' && t != ss))
+    {
+    *error = string_sprintf("malformed IPv4 address or address mask: %.*s", (int)(t - ss), ss);
+    return ERROR;
+    }

   }
 
 /* See if there is a semicolon in the pattern, separating a searchtype
   }
 
 /* See if there is a semicolon in the pattern, separating a searchtype


@@ -2952,6 +3060,8 @@ if ((semicolon = Ustrchr(ss, ';')))
     endname = semicolon;
     opts = NULL;
     }
     endname = semicolon;
     opts = NULL;
     }

+else
+  opts = NULL;

 
 /* If we are doing an IP address only match, then all lookups must be IP
 address lookups, even if there is no "net-". */
 
 /* If we are doing an IP address only match, then all lookups must be IP
 address lookups, even if there is no "net-". */


@@ -2981,19 +3091,16 @@ else
 
 if (iplookup)
   {
 
 if (iplookup)
   {

-  int insize;
-  int search_type;
-  int incoming[4];
-  void *handle;
-  uschar *filename, *key, *result;
+  const lookup_info * li;
+  int incoming[4], insize;
+  void * handle;
+  uschar * filename, * key, * result;

   uschar buffer[64];
 
   /* Find the search type */
 
   uschar buffer[64];
 
   /* Find the search type */
 

-  search_type = search_findtype(t, endname - t);
-
-  if (search_type < 0) log_write(0, LOG_MAIN|LOG_PANIC_DIE, "%s",
-    search_error_message);
+  if (!(li = search_findtype(t, endname - t)))
+    log_write(0, LOG_MAIN|LOG_PANIC_DIE, "%s", search_error_message);

 
   /* Adjust parameters for the type of lookup. For a query-style lookup, there
   is no file name, and the "key" is just the query. For query-style with a file
 
   /* Adjust parameters for the type of lookup. For a query-style lookup, there
   is no file name, and the "key" is just the query. For query-style with a file


@@ -3003,26 +3110,25 @@ if (iplookup)
   dot separators instead of colons, except when the lookup type is "iplsearch".
   */
 
   dot separators instead of colons, except when the lookup type is "iplsearch".
   */
 

-  if (mac_islookup(search_type, lookup_absfilequery))
+  if (mac_islookup(li, lookup_absfilequery))

     {
     filename = semicolon + 1;
     key = filename;
     {
     filename = semicolon + 1;
     key = filename;

-    while (*key != 0 && !isspace(*key)) key++;
+    Uskip_nonwhite(&key);

     filename = string_copyn(filename, key - filename);
     filename = string_copyn(filename, key - filename);

-    while (isspace(*key)) key++;
+    Uskip_whitespace(&key);

     }
     }

-  else if (mac_islookup(search_type, lookup_querystyle))
+  else if (mac_islookup(li, lookup_querystyle))

     {
     filename = NULL;
     key = semicolon + 1;
     }
   else   /* Single-key style */
     {
     {
     filename = NULL;
     key = semicolon + 1;
     }
   else   /* Single-key style */
     {

-    int sep = (Ustrcmp(lookup_list[search_type]->name, "iplsearch") == 0)?
-      ':' : '.';
+    int sep = Ustrcmp(li->name, "iplsearch") == 0 ? ':' : '.';

     insize = host_aton(cb->host_address, incoming);
     host_mask(insize, incoming, mlen);
     insize = host_aton(cb->host_address, incoming);
     host_mask(insize, incoming, mlen);

-    (void)host_nmtoa(insize, incoming, mlen, buffer, sep);
+    (void) host_nmtoa(insize, incoming, mlen, buffer, sep);

     key = buffer;
     filename = semicolon + 1;
     }
     key = buffer;
     filename = semicolon + 1;
     }


@@ -3030,7 +3136,7 @@ if (iplookup)
   /* Now do the actual lookup; note that there is no search_close() because
   of the caching arrangements. */
 
   /* Now do the actual lookup; note that there is no search_close() because
   of the caching arrangements. */
 

-  if (!(handle = search_open(filename, search_type, 0, NULL, NULL)))
+  if (!(handle = search_open(filename, li, 0, NULL, NULL)))

     log_write(0, LOG_MAIN|LOG_PANIC_DIE, "%s", search_error_message);
 
   result = search_find(handle, filename, key, -1, NULL, 0, 0, NULL, opts);
     log_write(0, LOG_MAIN|LOG_PANIC_DIE, "%s", search_error_message);
 
   result = search_find(handle, filename, key, -1, NULL, 0, 0, NULL, opts);


@@ -3053,7 +3159,7 @@ digits, full stops, and hyphens (the constituents of domain names). Allow
 underscores, as they are all too commonly found. Sigh. Also, if
 allow_utf8_domains is set, allow top-bit characters. */
 
 underscores, as they are all too commonly found. Sigh. Also, if
 allow_utf8_domains is set, allow top-bit characters. */
 

-for (t = ss; *t != 0; t++)
+for (t = ss; *t; t++)

   if (!isalnum(*t) && *t != '.' && *t != '-' && *t != '_' &&
       (!allow_utf8_domains || *t < 128)) break;
 
   if (!isalnum(*t) && *t != '.' && *t != '-' && *t != '_' &&
       (!allow_utf8_domains || *t < 128)) break;
 


@@ -3061,7 +3167,7 @@ for (t = ss; *t != 0; t++)
 its IP address and match against that. Note that a multi-homed host will add
 items to the chain. */
 
 its IP address and match against that. Note that a multi-homed host will add
 items to the chain. */
 

-if (*t == 0)
+if (!*t)

   {
   int rc;
   host_item h;
   {
   int rc;
   host_item h;


@@ -3092,8 +3198,8 @@ outgoing hosts, the name is always given explicitly. If it is NULL, it means we
 must use sender_host_name and its aliases, looking them up if necessary. */
 
 if (cb->host_name)   /* Explicit host name given */
 must use sender_host_name and its aliases, looking them up if necessary. */
 
 if (cb->host_name)   /* Explicit host name given */

-  return match_check_string(cb->host_name, ss, -1, TRUE, TRUE, TRUE,
-    valueptr);
+  return match_check_string(cb->host_name, ss, -1,
+    MCS_PARTIAL | MCS_CASELESS | MCS_AT_SPECIAL | cb->flags, valueptr);

 
 /* Host name not given; in principle we need the sender host name and its
 aliases. However, for query-style lookups, we do not need the name if the
 
 /* Host name not given; in principle we need the sender host name and its
 aliases. However, for query-style lookups, we do not need the name if the


@@ -3104,25 +3210,28 @@ on spec. */
 if ((semicolon = Ustrchr(ss, ';')))
   {
   const uschar * affix, * opts;
 if ((semicolon = Ustrchr(ss, ';')))
   {
   const uschar * affix, * opts;

-  int partial, affixlen, starflags, id;
+  int partial, affixlen, starflags;
+  const lookup_info * li;

 
   *semicolon = 0;
 
   *semicolon = 0;

-  id = search_findtype_partial(ss, &partial, &affix, &affixlen, &starflags,
+  li = search_findtype_partial(ss, &partial, &affix, &affixlen, &starflags,

          &opts);
   *semicolon=';';
 
          &opts);
   *semicolon=';';
 

-  if (id < 0)                           /* Unknown lookup type */
+  if (!li)                             /* Unknown lookup type */

     {
     log_write(0, LOG_MAIN|LOG_PANIC, "%s in host list item \"%s\"",
       search_error_message, ss);
     return DEFER;
     }
     {
     log_write(0, LOG_MAIN|LOG_PANIC, "%s in host list item \"%s\"",
       search_error_message, ss);
     return DEFER;
     }

-  isquery = mac_islookup(id, lookup_querystyle|lookup_absfilequery);
+  isquery = mac_islookup(li, lookup_querystyle|lookup_absfilequery);

   }
 
 if (isquery)
   {
   }
 
 if (isquery)
   {

-  switch(match_check_string(US"", ss, -1, TRUE, TRUE, TRUE, valueptr))
+  switch(match_check_string(US"", ss, -1,
+      MCS_PARTIAL| MCS_CASELESS| MCS_AT_SPECIAL | (cb->flags & MCS_CACHEABLE),
+      valueptr))

     {
     case OK:    return OK;
     case DEFER: return DEFER;
     {
     case OK:    return OK;
     case DEFER: return DEFER;


@@ -3136,19 +3245,24 @@ do a check on the name and all its aliases. */
 if (!sender_host_name)
   {
   HDEBUG(D_host_lookup)
 if (!sender_host_name)
   {
   HDEBUG(D_host_lookup)

-    debug_printf("sender host name required, to match against %s\n", ss);
+    debug_printf_indent("sender host name required, to match against %s\n", ss);
+  expand_level++;

   if (host_lookup_failed || host_name_lookup() != OK)
     {
   if (host_lookup_failed || host_name_lookup() != OK)
     {

+    expand_level--;

     *error = string_sprintf("failed to find host name for %s",
       sender_host_address);;
     return ERROR;
     }
     *error = string_sprintf("failed to find host name for %s",
       sender_host_address);;
     return ERROR;
     }

+  expand_level--;

   host_build_sender_fullhost();
   }
 
 /* Match on the sender host name, using the general matching function */
 
   host_build_sender_fullhost();
   }
 
 /* Match on the sender host name, using the general matching function */
 

-switch(match_check_string(sender_host_name, ss, -1, TRUE, TRUE, TRUE, valueptr))
+switch(match_check_string(sender_host_name, ss, -1,
+      MCS_PARTIAL| MCS_CASELESS| MCS_AT_SPECIAL | (cb->flags & MCS_CACHEABLE),
+      valueptr))

   {
   case OK:    return OK;
   case DEFER: return DEFER;
   {
   case OK:    return OK;
   case DEFER: return DEFER;


@@ -3158,7 +3272,9 @@ switch(match_check_string(sender_host_name, ss, -1, TRUE, TRUE, TRUE, valueptr))
 
 aliases = sender_host_aliases;
 while (*aliases)
 
 aliases = sender_host_aliases;
 while (*aliases)

-  switch(match_check_string(*aliases++, ss, -1, TRUE, TRUE, TRUE, valueptr))
+  switch(match_check_string(*aliases++, ss, -1,
+      MCS_PARTIAL| MCS_CASELESS| MCS_AT_SPECIAL | (cb->flags & MCS_CACHEABLE),
+      valueptr))

     {
     case OK:    return OK;
     case DEFER: return DEFER;
     {
     case OK:    return OK;
     case DEFER: return DEFER;


@@ -3234,8 +3350,8 @@ rc = match_check_list(
        check_host,                             /* function for testing */
        &cb,                                    /* argument for function */
        MCL_HOST,                               /* type of check */
        check_host,                             /* function for testing */
        &cb,                                    /* argument for function */
        MCL_HOST,                               /* type of check */

-       (host_address == sender_host_address)?
-         US"host" : host_address,              /* text for debugging */
+       host_address == sender_host_address
+         ? US"host" : host_address,           /* text for debugging */

        valueptr);                              /* where to pass back data */
 deliver_host_address = save_host_address;
 return rc;
        valueptr);                              /* where to pass back data */
 deliver_host_address = save_host_address;
 return rc;


@@ -3394,7 +3510,7 @@ if ((rc = verify_address(&vaddr, NULL, vopt_is_recipient | vopt_quota,
   }
 
 DEBUG(D_verify) debug_printf_indent("verify_quota: len %d\n", len);
   }
 
 DEBUG(D_verify) debug_printf_indent("verify_quota: len %d\n", len);

-write(1, msg, len);
+if (write(1, msg, len) != 0) ;

 return;
 }
 
 return;
 }
 


@@ -3415,7 +3531,7 @@ dbdata_callout_cache_address * cache_address_record;
 
 if (!pos_cache && !neg_cache)
   return FALSE;
 
 if (!pos_cache && !neg_cache)
   return FALSE;

-if (!(dbm_file = dbfn_open(US"callout", O_RDWR, &dbblock, FALSE, TRUE)))
+if (!(dbm_file = dbfn_open(US"callout", O_RDWR|O_CREAT, &dbblock, FALSE, TRUE)))

   {
   HDEBUG(D_verify) debug_printf_indent("quota cache: not available\n");
   return FALSE;
   {
   HDEBUG(D_verify) debug_printf_indent("quota cache: not available\n");
   return FALSE;