From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 18 Jul 2017 22:29:54 +0000 (+0100)
Subject: Do not rely on linker identifying common strings
X-Git-Tag: exim-4_90_RC1~107
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/d7571ac555518797c3553f6080f6aab3fda6ec58

Do not rely on linker identifying common strings
---

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 9b77f7d17..bf465c977 100644
--- 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
 	     )