Minor code restyling

bdamele · bdamele · commit 2d55ec19a3c6 · 2010-04-06T10:15:19.000Z
diff --git a/doc/THANKS b/doc/THANKS
@@ -203,6 +203,9 @@ Chris Patten <cpatten@sunera.com>
 Adam Pridgen <adam.pridgen@gmail.com>
     for suggesting some features
 
+Ole Rasmussen <olerass@gmail.com>
+    for reporting a bug
+
 Alberto Revelli <r00t@northernfortress.net>
     for inspiring me to write sqlmap user's manual in SGML
     for his great Microsoft SQL Server take over tool, sqlninja,
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -55,13 +55,6 @@
 from lib.core.exception import sqlmapSyntaxException
 from lib.core.exception import sqlmapUnsupportedDBMSException
 from lib.core.optiondict import optDict
-from lib.core.settings import MSSQL_ALIASES
-from lib.core.settings import MYSQL_ALIASES
-from lib.core.settings import PGSQL_ALIASES
-from lib.core.settings import ORACLE_ALIASES
-from lib.core.settings import SQLITE_ALIASES
-from lib.core.settings import ACCESS_ALIASES
-from lib.core.settings import FIREBIRD_ALIASES
 from lib.core.settings import IS_WIN
 from lib.core.settings import PLATFORM
 from lib.core.settings import SITE
@@ -494,8 +487,7 @@ def __setDBMS():
     logger.debug(debugMsg)
 
     conf.dbms = conf.dbms.lower()
-    aliases = MSSQL_ALIASES + MYSQL_ALIASES + PGSQL_ALIASES + ORACLE_ALIASES + SQLITE_ALIASES + ACCESS_ALIASES + FIREBIRD_ALIASES
-    firstRegExp = "(%s)" % "|".join([alias for alias in aliases])
+    firstRegExp = "(%s)" % "|".join([alias for alias in SUPPORTED_DBMS])
     dbmsRegExp = re.search("%s ([\d\.]+)" % firstRegExp, conf.dbms)
 
     if dbmsRegExp:
diff --git a/lib/core/target.py b/lib/core/target.py
@@ -222,9 +222,13 @@ def initTargetEnv():
     """
 
     if conf.multipleTargets:
+        if conf.cj:
+            conf.cj.clear()        
+
         conf.paramDict    = {}
         conf.parameters   = {}
         conf.sessionFile  = None
+
         kb.dbms           = None
         kb.dbmsDetected   = False
         kb.dbmsVersion    = None
@@ -235,8 +239,6 @@ def initTargetEnv():
         kb.unionComment   = ""
         kb.unionCount     = None
         kb.unionPosition  = None
-        if conf.cj:
-            conf.cj.clear()        
 
 def setupTargetEnv():
     __createTargetDirs()

-Original file line number
+Diff line change
 Adam Pridgen <[email protected]>
     for suggesting some features
 +Ole Rasmussen <[email protected]>
 +    for reporting a bug
++
 Alberto Revelli <[email protected]>
     for inspiring me to write sqlmap user's manual in SGML
     for his great Microsoft SQL Server take over tool, sqlninja,