From 3cf1658532f3023aaa550f89f94e01b70dc0a0e0 Mon Sep 17 00:00:00 2001
From: Bernardo Damele <bernardo.damele@gmail.com>
Date: Mon, 1 Dec 2008 23:07:41 +0000
Subject: [PATCH] Increased default output level from 0 to 1

---
 doc/ChangeLog        | 3 ++-
 lib/core/option.py   | 9 ++++-----
 lib/parse/cmdline.py | 2 +-
 sqlmap.conf          | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 5fcf66cd9..5518f1dd2 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -20,7 +20,7 @@ sqlmap (0.6.3-1) stable; urgency=low
     current database on MySQL and Microsoft SQL Server, the 'public'
     scheme on PostgreSQL and the 'USERS' TABLESPACE_NAME on Oracle;
   * Minor improvement to set by default in all HTTP requests the standard
-    HTTP headers (Accept, Accept-Encoding, etc);
+    client HTTP headers (Accept, Accept-Encoding, etc);
   * Minor improvements to sqlmap Debian package files: sqlmap uploaded
     to official Debian project repository, on queue at the moment;
   * Major bug fix to correctly handle httplib.BadStatusLine exception;
@@ -32,6 +32,7 @@ sqlmap (0.6.3-1) stable; urgency=low
   * Minor bug fix to correctly enumerate columns on Microsoft SQL Server;
   * Minor bug fix to correctly dump table entries when the column is
     provided;
+  * Increased default output level from 0 to 1;
   * Updated documentation.
 
  -- Bernardo Damele A. G. <bernardo.damele@gmail.com>  Day,  X YYY 2008 10:00:00 +0000
diff --git a/lib/core/option.py b/lib/core/option.py
index b41e9e115..05e2b047a 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -612,7 +612,7 @@ def __saveCmdline():
                 if datatype == "boolean":
                     value = "False"
                 elif datatype in ( "integer", "float" ):
-                    if option == "threads":
+                    if option in ( "threads", "verbose" ):
                         value = "1"
                     else:
                         value = "0"
@@ -635,13 +635,12 @@ def __setVerbosity():
     This function set the verbosity of sqlmap output messages.
     """
 
-    if not conf.verbose:
-        conf.verbose = 0
-        return
+    if conf.verbose == None:
+        conf.verbose = 1
 
     conf.verbose = int(conf.verbose)
 
-    if conf.verbose <= 1:
+    if conf.verbose == 1:
         logger.setLevel(logging.INFO)
     elif conf.verbose > 1 and conf.eta:
         conf.verbose = 1
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index e3c96cfdf..633969daa 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -244,7 +244,7 @@ def cmdLineParser():
                                       "in real time")
 
         miscellaneous.add_option("-v", dest="verbose", type="int",
-                                 help="Verbosity level: 0-5 (default 0)")
+                                 help="Verbosity level: 0-5 (default 1)")
 
         miscellaneous.add_option("--update", dest="updateAll", action="store_true",
                                 help="Update sqlmap to the latest stable version")
diff --git a/sqlmap.conf b/sqlmap.conf
index 6de0e63b4..eb3ca9fef 100644
--- a/sqlmap.conf
+++ b/sqlmap.conf
@@ -242,14 +242,14 @@ eta = False
 
 # Verbosity level.
 # Valid: integer between 0 and 5
-# 0: Silent
-# 1: Show info messages
+# 0: Show only warning and error messages
+# 1: Show also info messages
 # 2: Show also debug messages
 # 3: Show also HTTP requests
 # 4: Show also HTTP responses headers
 # 5: Show also HTTP responses page content
-# Default: 0
-verbose = 0
+# Default: 1
+verbose = 1
 
 # Update sqlmap to the latest stable version.
 # Valid: True or False