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

Minor bug fix to properly merge options from .conf file (-c) with command line switches

Browse Source
This commit is contained in:
Bernardo Damele 2010-12-13 21:36:23 +00:00
parent db844c1785
commit 4b79227b5a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/core/option.py
View File

@ -1298,7 +1298,8 @@ def __mergeOptions(inputOptions):
inputOptionsItems = inputOptions.__dict__.items()
for key, value in inputOptionsItems:
if not conf.has_key(key) or conf[key] is None or value is not None:
if key not in conf or (conf[key] is False and value is True) or \
value not in (None, False):
conf[key] = value
def __setTrafficOutputFP():