Minor adjustments

Cosmetics
This commit is contained in:
Bernardo Damele 2011-01-31 21:22:39 +00:00
parent ec9ebb3479
commit 2fd9621499
2 changed files with 11 additions and 12 deletions

View File

@ -348,18 +348,18 @@ def __goError(expression, expected=None, resumeValue=True, dump=False):
SQL injection vulnerability on the affected parameter. SQL injection vulnerability on the affected parameter.
""" """
result = None output = None
if conf.direct:
return direct(expression), None
if resumeValue: if resumeValue:
result = resume(expression, None) output = resume(expression, None)
if not result: if output and expected == EXPECTED.INT and not output.isdigit():
result = errorUse(expression, expected, resumeValue, dump) output = None
return result if output is None:
output = errorUse(expression, expected, resumeValue, dump)
return output
def __goInband(expression, expected=None, sort=True, resumeValue=True, unpack=True, dump=False): def __goInband(expression, expected=None, sort=True, resumeValue=True, unpack=True, dump=False):
""" """
@ -374,10 +374,10 @@ def __goInband(expression, expected=None, sort=True, resumeValue=True, unpack=Tr
if resumeValue: if resumeValue:
output = resume(expression, None) output = resume(expression, None)
if not output or (expected == EXPECTED.INT and not output.isdigit()): if not output or (output and (expected == EXPECTED.INT and not output.isdigit())):
partial = True partial = True
if not output: if output is None:
output = unionUse(expression, resetCounter=True, unpack=unpack, dump=dump) output = unionUse(expression, resetCounter=True, unpack=unpack, dump=dump)
if output: if output:
@ -490,7 +490,7 @@ def goStacked(expression, silent=False):
expression = cleanQuery(expression) expression = cleanQuery(expression)
if conf.direct: if conf.direct:
return direct(expression), None return direct(expression)
comment = queries[Backend.getIdentifiedDbms()].comment.query comment = queries[Backend.getIdentifiedDbms()].comment.query
query = agent.prefixQuery("; %s" % expression) query = agent.prefixQuery("; %s" % expression)

View File

@ -63,7 +63,6 @@ def main():
paths.SQLMAP_ROOT_PATH = modulePath() paths.SQLMAP_ROOT_PATH = modulePath()
setPaths() setPaths()
banner() banner()
# Store original command line options for possible later restoration # Store original command line options for possible later restoration