Merge r108731 from 2.12: MailHost fallback to HELO

db3e078e · Martijn Pieters · 63f13f3c · db3e078e
Commit db3e078e authored Feb 03, 2010 by Martijn Pieters
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

src/Products/MailHost/mailer.py src/Products/MailHost/mailer.py +4 -2

No files found.
--- a/src/Products/MailHost/mailer.py
+++ b/src/Products/MailHost/mailer.py
@@ -49,8 +49,10 @@ class SMTPMailer(object):
        # send EHLO
        code, response = connection.ehlo()
        if code < 200 or code >300:
-            raise RuntimeError('Error sending EHLO to the SMTP server '
+            code, response = connection.helo()
-                                '(code=%s, response=%s)' % (code, response))
+            if code < 200 or code >300:
+                raise RuntimeError('Error sending HELO to the SMTP server '
+                                   '(code=%s, response=%s)' % (code, response))
        # encryption support
        have_tls =  connection.has_extn('starttls')