From d554ffc0ae7a9b17373dd49a584e24a3fe519e90 Mon Sep 17 00:00:00 2001 From: Bernardo Damele Date: Wed, 27 Oct 2010 10:37:54 +0000 Subject: [PATCH] yes, I am quite paranoid with cosmetics --- lib/core/common.py | 2 +- plugins/dbms/maxdb/connector.py | 2 +- plugins/dbms/sqlite/connector.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index 8f98b0be1..f9164cee7 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -1505,7 +1505,7 @@ def beep(): """ if sys.platform == 'linux2': - for dev in ('/dev/audio', '/dev/dsp'): + for dev in ('/dev/audio', '/dev/dsp', '/dev/sound'): if os.path.exists(dev): try: audio = file(dev, 'wb') diff --git a/plugins/dbms/maxdb/connector.py b/plugins/dbms/maxdb/connector.py index 203e3635b..45930fc64 100644 --- a/plugins/dbms/maxdb/connector.py +++ b/plugins/dbms/maxdb/connector.py @@ -16,6 +16,6 @@ class Connector(GenericConnector): GenericConnector.__init__(self) def connect(self): - errMsg = "on SAP MaxDB it is not possible to establish an " + errMsg = "on SAP MaxDB it is not possible to establish a " errMsg += "direct connection" raise sqlmapUnsupportedFeatureException, errMsg diff --git a/plugins/dbms/sqlite/connector.py b/plugins/dbms/sqlite/connector.py index 55fc3468c..5d7c0b799 100644 --- a/plugins/dbms/sqlite/connector.py +++ b/plugins/dbms/sqlite/connector.py @@ -47,6 +47,7 @@ class Connector(GenericConnector): except (self.__sqlite.DatabaseError, self.__sqlite.OperationalError), msg: warnMsg = "unable to connect using SQLite 3 library, trying with SQLite 2" logger.warning(warnMsg) + try: try: import sqlite @@ -54,6 +55,7 @@ class Connector(GenericConnector): errMsg = "sqlmap requires 'python-sqlite2' third-party library " errMsg += "in order to directly connect to the database '%s'" % self.db raise sqlmapMissingDependence, errMsg + self.__sqlite = sqlite self.connector = self.__sqlite.connect(database=self.db, check_same_thread=False, timeout=conf.timeout) except (self.__sqlite.DatabaseError, self.__sqlite.OperationalError), msg: