From 0d239d36d00300aec2f662a0640b1951a790e651 Mon Sep 17 00:00:00 2001
From: lanjelot <lanjelot@gmail.com>
Date: Sun, 2 Aug 2015 12:25:52 +1000
Subject: [PATCH] fixed 2 minor bugs in smtp_login and ftp_login w/tls (thanks
 Julien)

---
 patator.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/patator.py b/patator.py
index 8974e11..854c8ff 100755
--- a/patator.py
+++ b/patator.py
@@ -2149,6 +2149,9 @@ class FTP_login(TCP_Cache):
 
     banner = fp.connect(host, int(port))
 
+    if tls != '0':
+      fp.auth()
+
     return TCP_Connection(fp, banner)
 
   def execute(self, host, port='21', tls='0', user=None, password=None, timeout='10', persistent='1'):
@@ -2458,11 +2461,11 @@ class SMTP_login(SMTP_Base):
         with Timing() as timing:
           resp = fp.login(user, password)
 
-      logger.debug('No error: %s' % resp)
+      logger.debug('No error: %s' % str(resp))
       self.reset()
 
     except (SMTPHeloError,SMTPAuthenticationError,SMTPException) as resp:
-      logger.debug('SMTPError: %s' % resp)
+      logger.debug('SMTPError: %s' % str(resp))
 
     if persistent == '0':
       self.reset()