minor fixes

stamparm · stamparm · commit 2504f4edb832 · 2012-04-03T10:10:33.000Z
diff --git a/lib/request/dns.py b/lib/request/dns.py
@@ -57,18 +57,11 @@ def __init__(self):
         self._socket.bind(("", 53))
         self._running = False
 
-    def pop(self):
-        retVal = None
-        with self._lock:
-            if len(self._requests):
-                retVal = self._requests.pop(0)
-        return retVal
-
-    def pop(self, prefix, suffix):
+    def pop(self, prefix=None, suffix=None):
         retVal = None
         with self._lock:
             for _ in self._requests:
-                if re.search("%s\..+\.%s" % (prefix, suffix), _, re.I):
+                if prefix is None and suffix is None or re.search("%s\..+\.%s" % (prefix, suffix), _, re.I):
                     retVal = _
                     self._requests.remove(_)
                     break
diff --git a/lib/request/inject.py b/lib/request/inject.py
@@ -86,7 +86,7 @@ def __goDns(payload, expression):
     if conf.dnsDomain and kb.dnsTest is not False:
         if kb.dnsTest is None:
             randInt = randomInt()
-            kb.dnsTest = dnsUse(payload, "SELECT %d" % randInt) == str(randInt)
+            kb.dnsTest = dnsUse(payload, "SELECT %d%s" % (randInt, FROM_DUMMY_TABLE.get(Backend.getIdentifiedDbms(), ""))) == str(randInt)
             if not kb.dnsTest:
                 errMsg = "test for data retrieval through DNS channel failed. Turning off DNS exfiltration support"
                 logger.error(errMsg)
diff --git a/procs/README.txt b/procs/README.txt
@@ -1,3 +1,3 @@
-Files in this folder represent SQL (Procedural Language) snippets used
+Files in this folder represent SPL/SQL snippets used
 by sqlmap on the target system. They are licensed under the terms of
 the GNU Lesser General Public License.
