On callout avoid SIZE every time but noncacheable rcpt main-verify. Bug 2151

[user/henk/code/exim.git] / src / src / deliver.c

diff --git a/src/src/deliver.c b/src/src/deliver.c
index e5c951560a0d9b6e71db3355ea0611bd4ecc7a4d..49281f93d47aa835f4ab9f4f28d734ba17a835f5 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -4465,7 +4465,7 @@ for (delivery_count = 0; addr_remote; delivery_count++)
       {
       smtp_transport_options_block * ob;
 
-      if (  !(  tp->info->driver_name == US"smtp"
+      if (  !(  Ustrcmp(tp->info->driver_name, "smtp") == 0
             && (ob = (smtp_transport_options_block *)tp->options_block)
             && ob->hosts_override && ob->hosts
             )
@@ -7077,7 +7077,7 @@ phase, to minimize cases of half-done things. */
 
 DEBUG(D_deliver)
   debug_printf(">>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>>\n");
-cancel_cutthrough_connection(TRUE, "deliveries are done");
+cancel_cutthrough_connection(TRUE, US"deliveries are done");
 
 /* Root privilege is no longer needed */
 
@@ -8474,7 +8474,7 @@ if (cutthrough.fd >= 0 && cutthrough.callout_hold_only)
 #ifdef SUPPORT_TLS
   if (cutthrough.is_tls)
     {
-    smtp_peer_options |= PEER_OFFERED_TLS;
+    smtp_peer_options |= OPTION_TLS;
     sending_ip_address = cutthrough.snd_ip;
     sending_port = cutthrough.snd_port;
 
@@ -8507,7 +8507,7 @@ if (cutthrough.fd >= 0 && cutthrough.callout_hold_only)
   }
 else
   {
-  cancel_cutthrough_connection(TRUE, "non-continued delivery");
+  cancel_cutthrough_connection(TRUE, US"non-continued delivery");
   (void) child_exec_exim(exec_type, FALSE, NULL, FALSE, 2, US"-Mc", message_id);
   }
 /* Control does not return here. */