sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-22 09:36:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor code restyling

Browse Source
This commit is contained in:
Bernardo Damele 2010-04-06 10:15:19 +00:00
parent e29e8f82f9
commit 2d55ec19a3
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/THANKS
View File

@ -203,6 +203,9 @@ Chris Patten <cpatten@sunera.com>
Adam Pridgen <adam.pridgen@gmail.com> Adam Pridgen <adam.pridgen@gmail.com>
for suggesting some features for suggesting some features
Ole Rasmussen <olerass@gmail.com>
for reporting a bug
Alberto Revelli <r00t@northernfortress.net> Alberto Revelli <r00t@northernfortress.net>
for inspiring me to write sqlmap user's manual in SGML for inspiring me to write sqlmap user's manual in SGML
for his great Microsoft SQL Server take over tool, sqlninja, for his great Microsoft SQL Server take over tool, sqlninja,

10
lib/core/option.py
View File

@ -55,13 +55,6 @@ from lib.core.exception import sqlmapMissingPrivileges
from lib.core.exception import sqlmapSyntaxException from lib.core.exception import sqlmapSyntaxException
from lib.core.exception import sqlmapUnsupportedDBMSException from lib.core.exception import sqlmapUnsupportedDBMSException
from lib.core.optiondict import optDict 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 IS_WIN
from lib.core.settings import PLATFORM from lib.core.settings import PLATFORM
from lib.core.settings import SITE from lib.core.settings import SITE
@ -494,8 +487,7 @@ def __setDBMS():
logger.debug(debugMsg) logger.debug(debugMsg)
conf.dbms = conf.dbms.lower() 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 SUPPORTED_DBMS])
firstRegExp = "(%s)" % "|".join([alias for alias in aliases])
dbmsRegExp = re.search("%s ([\d\.]+)" % firstRegExp, conf.dbms) dbmsRegExp = re.search("%s ([\d\.]+)" % firstRegExp, conf.dbms)
if dbmsRegExp: if dbmsRegExp:

6
lib/core/target.py
View File

@ -222,9 +222,13 @@ def initTargetEnv():
""" """
if conf.multipleTargets: if conf.multipleTargets:
if conf.cj:
conf.cj.clear()
conf.paramDict = {} conf.paramDict = {}
conf.parameters = {} conf.parameters = {}
conf.sessionFile = None conf.sessionFile = None
kb.dbms = None kb.dbms = None
kb.dbmsDetected = False kb.dbmsDetected = False
kb.dbmsVersion = None kb.dbmsVersion = None
@ -235,8 +239,6 @@ def initTargetEnv():
kb.unionComment = "" kb.unionComment = ""
kb.unionCount = None kb.unionCount = None
kb.unionPosition = None kb.unionPosition = None
if conf.cj:
conf.cj.clear()
def setupTargetEnv(): def setupTargetEnv():
__createTargetDirs() __createTargetDirs()