From d583cc07e7d249ba9065dd04a4ead5369e0c200a Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Tue, 30 Mar 2010 15:04:55 +0000
Subject: [PATCH] ms access update

---
 plugins/dbms/access/connector.py   | 3 ++-
 plugins/dbms/access/enumeration.py | 6 ++++++
 xml/queries.xml                    | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/plugins/dbms/access/connector.py b/plugins/dbms/access/connector.py
index 712e9e921..9a4bf9f3e 100644
--- a/plugins/dbms/access/connector.py
+++ b/plugins/dbms/access/connector.py
@@ -52,7 +52,8 @@ class Connector(GenericConnector):
         self.initConnection()
 
         try:
-            self.connector = pyodbc.connect(driver='{Microsoft Access Driver (*.mdb)}', dbq=self.db)
+            #self.connector = pyodbc.connect(driver='{Microsoft Access Driver (*.mdb)}', dbq=self.db, uid='Admin')
+            self.connector = pyodbc.connect('Driver={Microsoft Access Driver (*.mdb)};Dbq=%s;Uid=Admin;Pwd=;' % self.db)
         except pyodbc.OperationalError, msg:
             raise sqlmapConnectionException, msg[1]
 
diff --git a/plugins/dbms/access/enumeration.py b/plugins/dbms/access/enumeration.py
index 1598de4d3..c4670dded 100644
--- a/plugins/dbms/access/enumeration.py
+++ b/plugins/dbms/access/enumeration.py
@@ -29,7 +29,13 @@ from plugins.generic.enumeration import Enumeration as GenericEnumeration
 class Enumeration(GenericEnumeration):
     def __init__(self):
         GenericEnumeration.__init__(self, "Microsoft Access")
+        
+    def getDbs(self):
+        warnMsg = "on Microsoft Access it is not possible to enumerate databases"
+        logger.warn(warnMsg)
 
+        return []
+        
     def getBanner(self):
         warnMsg = "on Microsoft Access it is not possible to get a banner"
         logger.warn(warnMsg)
diff --git a/xml/queries.xml b/xml/queries.xml
index 68825a450..941fb3a3e 100644
--- a/xml/queries.xml
+++ b/xml/queries.xml
@@ -320,6 +320,10 @@
         <current_db/>
         <inference query="AND ASC(MID((%s), %d, 1)) > %d"/>
         <is_dba query="IIF(CURRENTUSER()='Admin',1,0)"/>
+        <dbs/> 
+        <tables>
+            <inband query="SELECT Name FROM MSysObjects WHERE (Left([Name],1) &lt;&gt; '~') AND (Left([Name],4) &lt;&gt; 'MSys') AND ([Type] In (1, 4, 6))"/>
+        </tables>       
    </dbms>
 
    <!-- Firebird -->