From 08bf8c201f7d5f8ebbf147874adf9ef367e70614 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 20 Feb 2012 10:24:55 +0000 Subject: [PATCH] few minor fixes --- doc/THANKS | 2 +- plugins/generic/enumeration.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/THANKS b/doc/THANKS index 93c11c229..46f80033d 100644 --- a/doc/THANKS +++ b/doc/THANKS @@ -633,7 +633,7 @@ fufuh for reporting a bug when running on Windows Hans Wurst - for reporting a bug + for reporting a couple of bugs james for reporting a bug diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py index 5e42954bf..05e3957d1 100644 --- a/plugins/generic/enumeration.py +++ b/plugins/generic/enumeration.py @@ -572,7 +572,7 @@ class Enumeration: count = inject.getValue(query, inband=False, error=False, expected=EXPECTED.INT, charsetType=2) if not isNumPosStrValue(count): - if not (isinstance(count, basestring) and count.isdigit()) and Backend.isDbms(DBMS.ORACLE) and not query2: + if Backend.isDbms(DBMS.ORACLE) and not query2: infoMsg = "trying with table USER_SYS_PRIVS" logger.info(infoMsg) @@ -1320,7 +1320,7 @@ class Enumeration: count = inject.getValue(query, expected=EXPECTED.INT, charsetType=2) - if count is not None and isinstance(count, basestring) and count.isdigit(): + if isNumPosStrValue(count): if safeSQLIdentificatorNaming(db) not in kb.data.cachedCounts: kb.data.cachedCounts[safeSQLIdentificatorNaming(db)] = {} @@ -1672,7 +1672,7 @@ class Enumeration: lengths = {} entries = {} - if count == "0": + if count == 0: warnMsg = "table '%s' " % unsafeSQLIdentificatorNaming(tbl) warnMsg += "on database '%s' " % unsafeSQLIdentificatorNaming(conf.db) warnMsg += "appears to be empty"