Remove extra HELO sent when using $smtp_auth_mech == 'none'

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5778 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/class/deliver/Deliver_SMTP.class.php b/class/deliver/Deliver_SMTP.class.php
index a70be716622dd46b056997907398d91e2f6faf22..19b306638772c6eadba18071ffaaa04021c228e5 100644 (file)
--- a/class/deliver/Deliver_SMTP.class.php
+++ b/class/deliver/Deliver_SMTP.class.php
@@ -115,11 +115,7 @@ class Deliver_SMTP extends Deliver {
     // CRAM-MD5 and DIGEST-MD5 code ends here
        } elseif ($smtp_auth_mech == 'none') {
          // No auth at all, just send helo and then send the mail
     // CRAM-MD5 and DIGEST-MD5 code ends here
        } elseif ($smtp_auth_mech == 'none') {
          // No auth at all, just send helo and then send the mail

-         fputs($stream, "HELO $helohost\r\n");
-      $tmp = fgets($stream, 1024);
-         if ($this->errorCheck($tmp, $stream)) {
-        return(0);
-         }
+      // We already said hi earlier, nothing more is needed.

        } elseif ($smtp_auth_mech == 'login') {
          // The LOGIN method
       fputs($stream, "AUTH LOGIN\r\n");
        } elseif ($smtp_auth_mech == 'login') {
          // The LOGIN method
       fputs($stream, "AUTH LOGIN\r\n");