Skipping quit exception in case of --search

stamparm · stamparm · commit ea4cef9c6d3b · 2015-09-24T13:44:51.000+02:00
diff --git a/plugins/dbms/mssqlserver/enumeration.py b/plugins/dbms/mssqlserver/enumeration.py
@@ -152,7 +152,7 @@ def getTables(self):
                     warnMsg += "for database '%s'" % db
                     logger.warn(warnMsg)
 
-        if not kb.data.cachedTables:
+        if not kb.data.cachedTables and not conf.search:
             errMsg = "unable to retrieve the tables for any database"
             raise SqlmapNoneDataException(errMsg)
         else:
diff --git a/plugins/generic/databases.py b/plugins/generic/databases.py
@@ -358,7 +358,7 @@ def getTables(self, bruteForce=None):
             if bruteForce is None:
                 logger.error(errMsg)
                 return self.getTables(bruteForce=True)
-            else:
+            elif not conf.search:
                 raise SqlmapNoneDataException(errMsg)
         else:
             for db, tables in kb.data.cachedTables.items():
@@ -432,10 +432,12 @@ def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None, dumpMod
                     tblList = tblList[0]
 
                 tblList = list(tblList)
-            else:
+            elif not conf.search:
                 errMsg = "unable to retrieve the tables "
                 errMsg += "in database '%s'" % unsafeSQLIdentificatorNaming(conf.db)
                 raise SqlmapNoneDataException(errMsg)
+            else:
+                return kb.data.cachedColumns
 
         tblList = filter(None, (safeSQLIdentificatorNaming(_, True) for _ in tblList))
 
diff --git a/plugins/generic/entries.py b/plugins/generic/entries.py
@@ -89,10 +89,12 @@ def dumpTable(self, foundData=None):
 
                 if isinstance(tblList[0], (set, tuple, list)):
                     tblList = tblList[0]
-            else:
+            elif not conf.search:
                 errMsg = "unable to retrieve the tables "
                 errMsg += "in database '%s'" % unsafeSQLIdentificatorNaming(conf.db)
                 raise SqlmapNoneDataException(errMsg)
+            else:
+                return
 
         for tbl in tblList:
             tblList[tblList.index(tbl)] = safeSQLIdentificatorNaming(tbl, True)
