Re: [Exim] bug: another LHLO problem

Top Page
Delete this message
Reply to this message
Author: Matt Bernstein
Date:  
To: exim-users
Subject: Re: [Exim] bug: another LHLO problem
At 11:17 -0000 Matt Bernstein wrote:

>If you do recipient verification with callouts, Exim sends "HELO" even
>over LMTP. The fix shouldn't be too difficult.


Hmm.. but I am busy, so the following bodge works-for-me(tm). Please
excuse its ugliness!

--- src/verify.c~    Mon Jul 22 09:59:52 2002
+++ src/verify.c    Wed Nov  6 11:29:07 2002
@@ -290,10 +290,16 @@
       if (smtp_read_response(&inblock, responsebuffer, sizeof(responsebuffer),
             '2', callout) &&


-          smtp_write_command(&outblock, FALSE, "HELO %s\r\n",
-            primary_hostname) >= 0 &&
-          smtp_read_response(&inblock, responsebuffer, sizeof(responsebuffer),
-            '2', callout) &&
+          (
+          (smtp_write_command(&outblock, FALSE, "HELO %s\r\n",
+                primary_hostname) >= 0 &&
+              smtp_read_response(&inblock, responsebuffer,
+        sizeof(responsebuffer), '2', callout))
+          ||  (smtp_write_command(&outblock, FALSE, "LHLO %s\r\n",
+                 primary_hostname) >= 0 &&
+               smtp_read_response(&inblock, responsebuffer,
+         sizeof(responsebuffer), '2', callout))
+      ) &&


           smtp_write_command(&outblock, FALSE, "MAIL FROM:<>\r\n") >= 0 &&
           smtp_read_response(&inblock, responsebuffer, sizeof(responsebuffer),