more concise language

This commit is contained in:
Miroslav Stampar 2012-01-07 17:45:45 +00:00
parent 138b8039b3
commit 18930539cd
4 changed files with 22 additions and 15 deletions

View File

@ -291,16 +291,18 @@ def __goInferenceProxy(expression, fromUser=False, expected=None, batch=False, r
stopLimit = 1
elif (not count or int(count) == 0):
warnMsg = "the SQL query provided does not "
warnMsg += "return any output"
logger.warn(warnMsg)
if not count:
warnMsg = "the SQL query provided does not "
warnMsg += "return any output"
logger.warn(warnMsg)
return None
elif (not count or int(count) == 0) and (not stopLimit or stopLimit == 0):
warnMsg = "the SQL query provided does not "
warnMsg += "return any output"
logger.warn(warnMsg)
if not count:
warnMsg = "the SQL query provided does not "
warnMsg += "return any output"
logger.warn(warnMsg)
return None

View File

@ -320,9 +320,10 @@ def errorUse(expression, expected=None, resumeValue=True, dump=False):
stopLimit = 1
elif (not count or int(count) == 0):
warnMsg = "the SQL query provided does not "
warnMsg += "return any output"
logger.warn(warnMsg)
if not count:
warnMsg = "the SQL query provided does not "
warnMsg += "return any output"
logger.warn(warnMsg)
return outputs

View File

@ -261,9 +261,10 @@ def unionUse(expression, unpack=True, dump=False):
stopLimit = 1
elif (not count or int(count) == 0):
warnMsg = "the SQL query provided does not "
warnMsg += "return any output"
logger.warn(warnMsg)
if not count:
warnMsg = "the SQL query provided does not "
warnMsg += "return any output"
logger.warn(warnMsg)
return value

View File

@ -315,13 +315,16 @@ def attackCachedUsersPasswords():
def attackDumpedTable():
if kb.data.dumpedTable:
infoMsg = "analyzing table dump for possible password hashes"
logger.info(infoMsg)
table = kb.data.dumpedTable
columns = table.keys()
count = table["__infos__"]["count"]
if not count:
return
infoMsg = "analyzing table dump for possible password hashes"
logger.info(infoMsg)
found = False
colUser = ''
colPasswords = set()