Cutthrough: expand transport dkim_domain option when testing for dkim signing

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

diff --git a/src/src/verify.c b/src/src/verify.c
index a730040286b5936c8d1f28997586f62ab34c6aaf..3624af0bc9e428c311d199b7ffc6acd26fd10b26 100644 (file)
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -889,13 +889,14 @@ can do it there for the non-rcpt-verify case.  For this we keep an addresscount.
     /* Need proper integration with the proper transport mechanism. */
     if (cutthrough.delivery)
       {
+      uschar * s;
       if (addr->transport->filter_command)
         {
         cutthrough.delivery = FALSE;
         HDEBUG(D_acl|D_v) debug_printf("Cutthrough cancelled by presence of transport filter\n");
         }
 #ifndef DISABLE_DKIM
-      if (ob->dkim_domain)
+      else if ((s = ob->dkim_domain) && (s = expand_string(s)) && *s)
         {
         cutthrough.delivery = FALSE;
         HDEBUG(D_acl|D_v) debug_printf("Cutthrough cancelled by presence of DKIM signing\n");