sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-02-09 16:10:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

better fix for the previous commit

Browse Source
This commit is contained in:
Miroslav Stampar 2011-05-02 13:34:55 +00:00
parent 20ad1c1f2f
commit 93dee30895
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/core/option.py
View File

@ -1228,6 +1228,12 @@ def __cleanupOptions():
if conf.dbms: if conf.dbms:
conf.dbms = conf.dbms.capitalize() conf.dbms = conf.dbms.capitalize()
if conf.optimize and any([conf.data, conf.textOnly]):
conf.nullConnection = False
debugMsg = "turning off --null-connection switch used indirectly by switch -o"
logger.debug(debugMsg)
# to distinguish explicit usage of --time-sec # to distinguish explicit usage of --time-sec
if conf.timeSec is None: if conf.timeSec is None:
if conf.tor: if conf.tor:
@ -1561,11 +1567,11 @@ def __basicOptionValidation():
raise sqlmapSyntaxException, errMsg raise sqlmapSyntaxException, errMsg
if conf.textOnly and conf.nullConnection: if conf.textOnly and conf.nullConnection:
errMsg = "switch --text-only is incompatible with switch --null-connection%s" % (" used indirectly by switch -o" if conf.optimize else "") errMsg = "switch --text-only is incompatible with switch --null-connection"
raise sqlmapSyntaxException, errMsg raise sqlmapSyntaxException, errMsg
if conf.data and conf.nullConnection: if conf.data and conf.nullConnection:
errMsg = "switch --data is incompatible with switch --null-connection%s" % (" used indirectly by switch -o" if conf.optimize else "") errMsg = "switch --data is incompatible with switch --null-connection"
raise sqlmapSyntaxException, errMsg raise sqlmapSyntaxException, errMsg
if conf.predictOutput and conf.threads > 1: if conf.predictOutput and conf.threads > 1: