From: Phil Pennock <pdp@exim.org>
Date: Mon, 3 Oct 2011 12:10:11 +0000 (-0400)
Subject: PP/12 fix uninitialised greeting string from PP/03
X-Git-Tag: exim-4_77_RC1^0
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0d0e445543703d3294a16a17a4606c9eade7afcb;p=exim.git

PP/12 fix uninitialised greeting string from PP/03
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index a911d80a1..b58444a55 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -121,6 +121,8 @@ PP/11 match_* no longer expand right-hand-side by default.
       New compile-time build option, EXPAND_LISTMATCH_RHS.
       New expansion conditions, "inlist", "inlisti".
 
+PP/12 fix uninitialised greeting string from PP/03 (smtps client support).
+
 
 Exim version 4.76
 -----------------
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 53012eced..c571d874c 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -1181,21 +1181,20 @@ if (tls_active >= 0)
       }
     }
 
-  /* For SMTPS we need to wait for the initial OK response.
-  Also, it seems likely that a server not supporting STARTTLS is broken
-  enough to perhaps not support EHLO. */
+  /* For SMTPS we need to wait for the initial OK response. */
   if (smtps)
     {
     if (!smtp_read_response(&inblock, buffer, sizeof(buffer), '2',
       ob->command_timeout)) goto RESPONSE_FAILED;
-    if (esmtp)
-      greeting_cmd = "EHLO";
-    else
-      {
-      greeting_cmd = "HELO";
-      DEBUG(D_transport)
-        debug_printf("not sending EHLO (host matches hosts_avoid_esmtp)\n");
-      }
+    }
+
+  if (esmtp)
+    greeting_cmd = "EHLO";
+  else
+    {
+    greeting_cmd = "HELO";
+    DEBUG(D_transport)
+      debug_printf("not sending EHLO (host matches hosts_avoid_esmtp)\n");
     }
 
   if (smtp_write_command(&outblock, FALSE, "%s %s\r\n",