From a193205323c056b60ee1db5e1d42b2ac2383feb6 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Tue, 12 Jan 2010 14:01:58 +0000
Subject: [PATCH] minor update regarding requestFile option

---
 lib/core/optiondict.py | 6 +++---
 lib/parse/cmdline.py   | 6 +++---
 sqlmap.conf            | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
index 39d9d3e6e..62b4e2f91 100644
--- a/lib/core/optiondict.py
+++ b/lib/core/optiondict.py
@@ -28,7 +28,8 @@ optDict = {
                                "url":               "string",
                                "list":              "string",
                                "googleDork":        "string",
-                               "configFile":        "string"
+                               "configFile":        "string",
+                               "requestFile":       "string"
                              },
 
             "Request":       {
@@ -48,8 +49,7 @@ optDict = {
                                "delay":             "float",
                                "timeout":           "float",
                                "retries":           "integer",
-                               "scope":             "string",
-                               "requestFile":       "string"
+                               "scope":             "string"
                              },
 
             "Injection":     {
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index 71463c6c0..e37f7dedd 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -59,6 +59,9 @@ def cmdLineParser():
         target.add_option("-c", dest="configFile",
                           help="Load options from a configuration INI file")
                           
+        target.add_option("-r", dest="requestFile",
+                          help="Load HTTP request from a file")
+                          
         # Request options
         request = OptionGroup(parser, "Request", "These options can be used "
                               "to specify how to connect to the target url.")
@@ -121,9 +124,6 @@ def cmdLineParser():
         request.add_option("--scope", dest="scope", 
                            help="Regexp to filter targets from provided proxy log")
 
-        request.add_option("-r", dest="requestFile",
-                          help="Load HTTP request from a file")
-
         # Injection options
         injection = OptionGroup(parser, "Injection", "These options can be "
                                 "used to specify which parameters to test "
diff --git a/sqlmap.conf b/sqlmap.conf
index 615ea0d2e..39b743bf1 100644
--- a/sqlmap.conf
+++ b/sqlmap.conf
@@ -17,6 +17,10 @@ list =
 # Example: +ext:php +inurl:"&id=" +intext:"powered by "
 googleDork = 
 
+# Load HTTP request from a file
+# Example (file content): POST /login.jsp HTTP/1.1\nUser-Agent: Mozilla/4.0\n\nuserid=joe&password=guessme
+requestFile = 
+
 [Request]
 
 # HTTP method to perform HTTP requests.
@@ -99,10 +103,6 @@ retries = 3
 # Example: (google|yahoo)
 scope = 
 
-# Load HTTP request from a file
-# Example (file content): POST /login.jsp HTTP/1.1\nUser-Agent: Mozilla/4.0\n\nuserid=joe&password=guessme
-requestFile = 
-
 [Injection]
 
 # Testable parameter(s) comma separated. By default all GET/POST/Cookie