mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2025-07-05 20:33:10 +03:00
Cleanup
This commit is contained in:
parent
7da3d8dbd1
commit
cce3208b35
|
@ -15,7 +15,7 @@ are permitted provided that the following conditions are met:
|
||||||
3. Neither the name of Dan Haim nor the names of his contributors may be used
|
3. Neither the name of Dan Haim nor the names of his contributors may be used
|
||||||
to endorse or promote products derived from this software without specific
|
to endorse or promote products derived from this software without specific
|
||||||
prior written permission.
|
prior written permission.
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY DAN HAIM "AS IS" AND ANY EXPRESS OR IMPLIED
|
THIS SOFTWARE IS PROVIDED BY DAN HAIM "AS IS" AND ANY EXPRESS OR IMPLIED
|
||||||
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
||||||
|
|
|
@ -189,7 +189,7 @@ def __saveToResultsFile():
|
||||||
if not results:
|
if not results:
|
||||||
line = "%s,,,%s" % (conf.url, os.linesep)
|
line = "%s,,,%s" % (conf.url, os.linesep)
|
||||||
conf.resultsFP.writelines(line)
|
conf.resultsFP.writelines(line)
|
||||||
|
|
||||||
def start():
|
def start():
|
||||||
"""
|
"""
|
||||||
This function calls a function that performs checks on both URL
|
This function calls a function that performs checks on both URL
|
||||||
|
|
|
@ -1052,7 +1052,7 @@ class Enumeration:
|
||||||
else:
|
else:
|
||||||
condQuery = " AND (%s)" % " OR ".join("%s = '%s'" % (condition, unsafeSQLIdentificatorNaming(col)) for col in colList)
|
condQuery = " AND (%s)" % " OR ".join("%s = '%s'" % (condition, unsafeSQLIdentificatorNaming(col)) for col in colList)
|
||||||
infoMsg += "'%s' " % ", ".join(unsafeSQLIdentificatorNaming(col) for col in colList)
|
infoMsg += "'%s' " % ", ".join(unsafeSQLIdentificatorNaming(col) for col in colList)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
condQuery = ""
|
condQuery = ""
|
||||||
|
|
||||||
|
|
|
@ -70,9 +70,8 @@ def main():
|
||||||
# Store original command line options for possible later restoration
|
# Store original command line options for possible later restoration
|
||||||
cmdLineOptions.update(cmdLineParser().__dict__)
|
cmdLineOptions.update(cmdLineParser().__dict__)
|
||||||
|
|
||||||
dataToStdout("[!] Legal disclaimer: %s\n\n" % LEGAL_DISCLAIMER, forceOutput=True)
|
dataToStdout("[!] legal disclaimer: %s\n\n" % LEGAL_DISCLAIMER, forceOutput=True)
|
||||||
|
dataToStdout("[*] starting at %s\n\n" % time.strftime("%X"), forceOutput=True)
|
||||||
dataToStdout("[*] starting at: %s\n\n" % time.strftime("%X"), forceOutput=True)
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
init(cmdLineOptions)
|
init(cmdLineOptions)
|
||||||
|
@ -121,7 +120,7 @@ def main():
|
||||||
closeDumper(True)
|
closeDumper(True)
|
||||||
|
|
||||||
finally:
|
finally:
|
||||||
dataToStdout("\n[*] shutting down at: %s\n\n" % time.strftime("%X"), forceOutput=True)
|
dataToStdout("\n[*] shutting down at %s\n\n" % time.strftime("%X"), forceOutput=True)
|
||||||
|
|
||||||
kb.threadContinue = False
|
kb.threadContinue = False
|
||||||
kb.threadException = True
|
kb.threadException = True
|
||||||
|
|
Loading…
Reference in New Issue
Block a user