few bug fixes (NTLM credential parsing was wrong), some switch reordering (few Misc to General), implemented --check-waf switch (irony is that this will also be called highly experimental/unstable while other things will be called "major/turbo/super bug fix/implementation")

sqlmap.conf

@@ -513,6 +513,11 @@ batch = False
 # Force character encoding used for data retrieval.
 charset = 
 
+# Crawl the website starting from the target url
+# Valid: integer
+# Default: 0
+crawlDepth = 0
+
 # Retrieve each query output length and calculate the estimated time of
 # arrival in real time.
 # Valid: True or False
@@ -522,10 +527,26 @@ eta = False
 # Valid: True or False
 flushSession = False
 
+# Parse and test forms on target url
+# Valid: True or False
+forms = False
+
 # Ignores query results stored in session file.
 # Valid: True or False
 freshQueries = False
 
+# Parse and display DBMS error messages from responses.
+# Valid: True or False
+parseErrors = False
+
+# Replicate dumped data into a sqlite3 database.
+# Valid: True or False
+replicate = False
+
+# Use default Tor (Vidalia/Privoxy/Polipo) proxy address.
+# Valid: True or False
+tor = False
+
 # Update sqlmap.
 # Valid: True or False
 updateAll = False
@@ -536,26 +557,20 @@ updateAll = False
 # Alert with audio beep when sql injection found.
 beep = False
 
-# IDS detection testing of injection payloads.
+# Offline WAF/IPS/IDS payload detection testing.
 checkPayload = False
 
+# Check for existence of WAF/IPS/IDS protection.
+checkWaf = False
+
 # Clean up the DBMS by sqlmap specific UDF and tables.
 # Valid: True or False
 cleanup = False
 
-# Crawl the website starting from the target url
-# Valid: integer
-# Default: 0
-crawlDepth = 0
-
 # Show which sqlmap dependencies are not available.
 # Valid: True or False
 dependencies = False
 
-# Parse and test forms on target url
-# Valid: True or False
-forms = False
-
 # Use Google dork results from specified page number.
 # Valid: integer
 # Default: 1
@@ -569,18 +584,6 @@ mobile = False
 # Valid: True or False
 pageRank = False
 
-# Parse and display DBMS error messages from responses.
-# Valid: True or False
-parseErrors = False
-
-# Replicate dumped data into a sqlite3 database.
-# Valid: True or False
-replicate = False
-
-# Use default Tor (Vidalia/Privoxy/Polipo) proxy address.
-# Valid: True or False
-tor = False
-
 # Simple wizard interface for beginner users.
 # Valid: True or False
 wizard = False