From 98bd95bd5e865cb238bab46d082065cacc121be1 Mon Sep 17 00:00:00 2001
From: lanjelot <lanjelot@gmail.com>
Date: Sat, 21 Mar 2020 15:01:58 +1000
Subject: [PATCH] Switch to bionic64

---
 Vagrantfile      | 4 ++--
 patator.py       | 8 +++++---
 requirements.txt | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 5ce4e48..6124ec3 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -13,7 +13,7 @@ apt-get install -y tmux git wget build-essential vim
 # requirements.txt deps
 apt-get install -y libcurl4-openssl-dev python3-dev libssl-dev # pycurl
 apt-get install -y ldap-utils # ldapsearch
-apt-get install -y libmysqlclient-dev # mysqlclient-python
+apt-get install -y libmariadbclient-dev # mysqlclient-python
 apt-get install -y ike-scan unzip default-jdk
 apt-get install -y libsqlite3-dev libsqlcipher-dev # pysqlcipher
 apt-get install -y libpq-dev # psycopg2
@@ -33,7 +33,7 @@ pip install patator
 SCRIPT
 
 Vagrant.configure(2) do |config|
-  config.vm.box = "ubuntu/xenial64"
+  config.vm.box = "ubuntu/bionic64"
   config.vm.box_check_update = false
  
   # prevent TTY error messages
diff --git a/patator.py b/patator.py
index c58e5d6..34836ff 100755
--- a/patator.py
+++ b/patator.py
@@ -2522,10 +2522,12 @@ class SMTP_Base(TCP_Cache):
   def connect(self, host, port, ssl, helo, starttls, timeout):
 
     if ssl == '0':
-      if not port: port = 25
+      if not port:
+        port = 25
       fp = SMTP(timeout=int(timeout))
     else:
-      if not port: port = 465
+      if not port:
+        port = 465
       fp = SMTP_SSL(timeout=int(timeout))
 
     resp = fp.connect(host, int(port))
@@ -3235,7 +3237,7 @@ class VMauthd_login(TCP_Cache):
 
 # MySQL {{{
 try:
-  import _mysql
+  from MySQLdb import _mysql
 except ImportError:
   notfound.append('mysqlclient')
 
diff --git a/requirements.txt b/requirements.txt
index bb8acd4..5c93b5a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 paramiko
 pycurl
 ajpy
-#impacket # no python3 compatibility
+impacket
 pyopenssl
 cx_Oracle
 mysqlclient