This commit is contained in:
Bernardo Damele 2011-06-13 19:00:27 +00:00
parent 7152a1ed3b
commit 8978fded03
5 changed files with 11 additions and 11 deletions

View File

@ -113,7 +113,7 @@ from lib.request.certhandler import HTTPSCertAuthHandler
from lib.request.rangehandler import HTTPRangeHandler from lib.request.rangehandler import HTTPRangeHandler
from lib.request.redirecthandler import SmartRedirectHandler from lib.request.redirecthandler import SmartRedirectHandler
from lib.request.templates import getPageTemplate from lib.request.templates import getPageTemplate
from lib.utils.dependences import checkDependences from lib.utils.deps import checkDependencies
from lib.utils.google import Google from lib.utils.google import Google
authHandler = urllib2.BaseHandler() authHandler = urllib2.BaseHandler()
@ -1744,7 +1744,7 @@ def init(inputOptions=advancedDict(), overrideOptions=False):
__saveCmdline() __saveCmdline()
__setRequestFromFile() __setRequestFromFile()
__cleanupOptions() __cleanupOptions()
checkDependences() checkDependencies()
__basicOptionValidation() __basicOptionValidation()
__setTorProxySettings() __setTorProxySettings()
__setMultipleTargets() __setMultipleTargets()

View File

@ -174,7 +174,7 @@ optDict = {
"replicate": "boolean", "replicate": "boolean",
"tor": "boolean", "tor": "boolean",
"wizard": "boolean", "wizard": "boolean",
"dependences": "boolean", "dependencies": "boolean",
"verbose": "integer" "verbose": "integer"
}, },
} }

View File

@ -537,9 +537,9 @@ def cmdLineParser():
action="store_true", default=False, action="store_true", default=False,
help="Simple wizard interface for beginner users") help="Simple wizard interface for beginner users")
miscellaneous.add_option("--dependences", dest="dependences", miscellaneous.add_option("--dependencies", dest="dependencies",
action="store_true", default=False, action="store_true", default=False,
help="Show which sqlmap dependences are not available") help="Show which sqlmap dependencies are not available")
# Hidden and/or experimental options # Hidden and/or experimental options
parser.add_option("--profile", dest="profile", action="store_true", parser.add_option("--profile", dest="profile", action="store_true",
@ -590,8 +590,8 @@ def cmdLineParser():
(args, _) = parser.parse_args(args) (args, _) = parser.parse_args(args)
if not any([args.direct, args.url, args.logFile, args.bulkFile, args.googleDork, args.configFile, \ if not any([args.direct, args.url, args.logFile, args.bulkFile, args.googleDork, args.configFile, \
args.requestFile, args.updateAll, args.smokeTest, args.liveTest, args.realTest, args.wizard, args.dependences]): args.requestFile, args.updateAll, args.smokeTest, args.liveTest, args.realTest, args.wizard, args.dependencies]):
errMsg = "missing a mandatory parameter (-d, -u, -l, -m, -r, -g, -c, --wizard, --update or --dependences), " errMsg = "missing a mandatory parameter (-d, -u, -l, -m, -r, -g, -c, --wizard, --update or --dependencies), "
errMsg += "-h for help" errMsg += "-h for help"
parser.error(errMsg) parser.error(errMsg)

View File

@ -14,7 +14,7 @@ from lib.core.exception import sqlmapMissingDependence
from lib.core.settings import DBMS_DICT from lib.core.settings import DBMS_DICT
from lib.core.settings import IS_WIN from lib.core.settings import IS_WIN
def checkDependences(): def checkDependencies():
missing_libraries = set() missing_libraries = set()
for dbmsName, data in DBMS_DICT.items(): for dbmsName, data in DBMS_DICT.items():
@ -103,4 +103,4 @@ def checkDependences():
missing_libraries.add('python-pyreadline') missing_libraries.add('python-pyreadline')
if len(missing_libraries) == 0: if len(missing_libraries) == 0:
infoMsg = "all dependences are installed" infoMsg = "all dependencies are installed"

View File

@ -576,9 +576,9 @@ tor = False
# Valid: True or False # Valid: True or False
wizard = False wizard = False
# Show which sqlmap dependences are not available. # Show which sqlmap dependencies are not available.
# Valid: True or False # Valid: True or False
dependences = False dependencies = False
# Verbosity level. # Verbosity level.
# Valid: integer between 0 and 6 # Valid: integer between 0 and 6