From 68a95fd1b1c52f52228e3f7605927c8ca38e282d Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Sun, 20 Feb 2011 22:45:23 +0000
Subject: [PATCH] minor update

---
 plugins/dbms/maxdb/enumeration.py  | 5 +++++
 plugins/dbms/sybase/enumeration.py | 6 +++++-
 xml/queries.xml                    | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/plugins/dbms/maxdb/enumeration.py b/plugins/dbms/maxdb/enumeration.py
index 98552c1d1..b6ae864ba 100644
--- a/plugins/dbms/maxdb/enumeration.py
+++ b/plugins/dbms/maxdb/enumeration.py
@@ -15,6 +15,7 @@ from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.data import queries
 from lib.core.enums import PAYLOAD
+from lib.core.exception import sqlmapMissingMandatoryOptionException
 from plugins.generic.enumeration import Enumeration as GenericEnumeration
 
 class Enumeration(GenericEnumeration):
@@ -36,6 +37,10 @@ class Enumeration(GenericEnumeration):
         return []
 
     def getColumns(self, onlyColNames=False):
+        if not conf.tbl:
+            errMsg = "missing table parameter"
+            raise sqlmapMissingMandatoryOptionException, errMsg
+
         if "." in conf.tbl:
             conf.db, conf.tbl = conf.tbl.split(".")
 
diff --git a/plugins/dbms/sybase/enumeration.py b/plugins/dbms/sybase/enumeration.py
index ec0fa9c7b..3203c8c2a 100644
--- a/plugins/dbms/sybase/enumeration.py
+++ b/plugins/dbms/sybase/enumeration.py
@@ -16,7 +16,7 @@ from lib.core.data import logger
 from lib.core.data import queries
 from lib.core.dicts import sybaseTypes
 from lib.core.enums import PAYLOAD
-from lib.core.exception import sqlmapUnsupportedFeatureException
+from lib.core.exception import sqlmapMissingMandatoryOptionException
 from plugins.generic.enumeration import Enumeration as GenericEnumeration
 
 class Enumeration(GenericEnumeration):
@@ -47,6 +47,10 @@ class Enumeration(GenericEnumeration):
         return kb.data.cachedUsers
 
     def getColumns(self, onlyColNames=False):
+        if not conf.tbl:
+            errMsg = "missing table parameter"
+            raise sqlmapMissingMandatoryOptionException, errMsg
+
         if "." in conf.tbl:
             conf.db, conf.tbl = conf.tbl.split(".")
 
diff --git a/xml/queries.xml b/xml/queries.xml
index d5d9f9807..141b1dd8a 100644
--- a/xml/queries.xml
+++ b/xml/queries.xml
@@ -446,7 +446,7 @@
         <delimiter query=","/>
         <substring query="SUBSTR((%s), %d, %d)"/>
         <users>
-            <inband query="SELECT username FROM domain.users ORDER BY 1"/>
+            <inband query="SELECT username FROM domain.users"/>
             <blind query="SELECT MIN(username) FROM domain.users WHERE username > '%s'" count="SELECT CHR(COUNT(*)) FROM domain.users"/>
         </users>
         <columns>