Removing --disable... switches and making changes in default choice(s) for respectable sections

lib/core/optiondict.py

@@ -190,8 +190,6 @@ optDict = {
                                "checkPayload":      "boolean",
                                "cleanup":           "boolean",
                                "dependencies":      "boolean",
-                               "disableHash":       "boolean",
-                               "disableLike":       "boolean",
                                "googlePage":        "integer",
                                "mobile":            "boolean",
                                "pageRank":          "boolean",

lib/parse/cmdline.py

@@ -610,14 +610,6 @@ def cmdLineParser():
                                   action="store_true",
                                   help="Check for missing sqlmap dependencies")
 
-        miscellaneous.add_option("--disable-hash", dest="disableHash",
-                                  action="store_true",
-                                  help="Disable password hash cracking mechanism")
-
-        miscellaneous.add_option("--disable-like", dest="disableLike",
-                                  action="store_true",
-                                  help="Disable LIKE search of identificator names")
-
         miscellaneous.add_option("--gpage", dest="googlePage", type="int",
                                   help="Use Google dork results from specified page number")
 

lib/utils/hash.py

@@ -362,7 +362,7 @@ def attackDumpedTable():
         if attack_dict:
             message = "recognized possible password hashes in column%s " % ("s" if len(col_passwords) > 1 else "")
             message += "'%s'. Do you want to " % ", ".join(col for col in col_passwords)
-            message += "crack them via a dictionary-based attack? [Y/n/q]"
+            message += "crack them via a dictionary-based attack? [y/N/q]"
             test = readInput(message, default="Y")
 
             if test[0] in ("n", "N"):