Merge branch 'master' of github.com:sqlmapproject/sqlmap

bdamele · bdamele · commit 378654168119 · 2013-02-11T18:08:04.000Z
diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py
@@ -507,6 +507,8 @@ def _controlMsfCmd(self, proc, func):
                 if pwnBofCond or smbRelayCond:
                     func()
 
+                timeout = time.time() - start_time > METASPLOIT_SESSION_TIMEOUT
+
                 if not initialized:
                     match = re.search("session ([\d]+) opened", out)
 
@@ -519,13 +521,13 @@ def _controlMsfCmd(self, proc, func):
 
                         initialized = True
 
-                    elif time.time() - start_time > METASPLOIT_SESSION_TIMEOUT:
+                    elif timeout:
                         proc.kill()
                         errMsg = "timeout occurred while attempting "
                         errMsg += "to open a remote session"
                         raise SqlmapGenericException(errMsg)
 
-                if conf.liveTest and time.time() - start_time > METASPLOIT_SESSION_TIMEOUT:
+                if conf.liveTest and timeout:
                     if initialized:
                         send_all(proc, "exit\n")
                         time.sleep(2)
diff --git a/plugins/dbms/mysql/fingerprint.py b/plugins/dbms/mysql/fingerprint.py
@@ -181,7 +181,7 @@ def checkDbms(self):
             # Reference: http://bugs.mysql.com/bug.php?id=15855
 
             # Determine if it is MySQL >= 5.0.0
-            if inject.checkBooleanExpression("ISNULL(TIMESTAMPADD(MINUTE,[RANDNUM],[RANDNUM]))"):
+            if inject.checkBooleanExpression("ISNULL(TIMESTAMPADD(MINUTE,[RANDNUM],0))"):
                 kb.data.has_information_schema = True
                 Backend.setVersion(">= 5.0.0")
                 setDbms("%s 5" % DBMS.MYSQL)
