PenTest/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-12-06 12:41:30 +00:00
Code Issues Projects Releases Wiki Activity

Minor improvement so that user's options can also be passed directly as a dictionary/advancedDict rather than only as an optparse instance.

Browse Source
This commit is contained in:
Bernardo Damele
2009-06-05 10:15:55 +00:00
parent 5ac2b0658c
commit 3bca0d4b28
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/core/option.py
View File

@@ -949,7 +949,12 @@ def __mergeOptions(inputOptions):
if inputOptions.configFile:
configFileParser(inputOptions.configFile)
for key, value in inputOptions.__dict__.items():
if hasattr(inputOptions, "items"):
inputOptionsItems = inputOptions.items()
else:
inputOptionsItems = inputOptions.__dict__.items()
for key, value in inputOptionsItems:
if not conf.has_key(key) or conf[key] == None or value != None:
conf[key] = value