From 6af5fa3d72b1817ce9a496a3aa59804d8dbcd40a Mon Sep 17 00:00:00 2001
From: ced <>
Date: Mon, 8 Oct 2007 13:19:44 +0000
Subject: [PATCH] smtplib must connect before login

bzr revid: ced-52a38ff0517e65b49a2027b2fa0f3de1c758ca13
---
 bin/tools/misc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 3c5e790ebb5..08ec90f4e02 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -232,9 +232,9 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
 		msg['Message-Id'] = '<'+str(time.time())+'-tinycrm-'+str(tinycrm)+'@'+socket.gethostname()+'>'
 	try:
 		s = smtplib.SMTP()
+		s.connect(config['smtp_server'])
 		if config['smtp_user'] or config['smtp_password']:
 			s.login(config['smtp_user'], config['smtp_password'])
-		s.connect(config['smtp_server'])
 		s.sendmail(email_from, email_to + email_cc + email_bcc, msg.as_string())
 		s.quit()
 	except Exception, e:
@@ -286,9 +286,9 @@ def email_send_attach(email_from, email_to, subject, body, email_cc=None, email_
 		msg.attach(part)
 	try:
 		s = smtplib.SMTP()
+		s.connect(config['smtp_server'])
 		if config['smtp_user'] or config['smtp_password']:
 			s.login(config['smtp_user'], config['smtp_password'])
-		s.connect(config['smtp_server'])
 		s.sendmail(email_from, email_to + email_cc + email_bcc, msg.as_string())
 		s.quit()
 	except Exception, e: