From 09c2c717cc82061c09c91359b2c59661854bb846 Mon Sep 17 00:00:00 2001 From: tassium Date: Fri, 26 Sep 2003 16:54:46 +0000 Subject: [PATCH] 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 --- class/deliver/Deliver_SMTP.class.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/class/deliver/Deliver_SMTP.class.php b/class/deliver/Deliver_SMTP.class.php index a70be716..19b30663 100644 --- 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 - 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"); -- 2.25.1