Merge branch 'msfrpcUpdate' of github.com:scriptjunkie/metasploit-framework into scriptjunkie-msfrpcUpdate

sinn3r · sinn3r · commit 6e1182bd9fa7 · 2013-03-26T10:42:57.000-05:00
diff --git a/msfrpc b/msfrpc
@@ -30,7 +30,6 @@ arguments = Rex::Parser::Arguments.new(
 	"-p" => [ true,  "Connect to the specified port instead of 55553"       ],
 	"-U" => [ true,  "Specify the username to access msfrpcd"               ],
 	"-P" => [ true,  "Specify the password to access msfrpcd"               ],
-	"-t" => [ true,  "Type of RPC daemon, [XML|Msg]"                        ],
 	"-S" => [ false, "Disable SSL on the RPC socket"                        ],
 	"-h" => [ false, "Help banner"                                          ]
 )

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ arguments = Rex::Parser::Arguments.new(`
`30`	`30`	`"-p" => [ true, "Connect to the specified port instead of 55553" ],`
`31`	`31`	`"-U" => [ true, "Specify the username to access msfrpcd" ],`
`32`	`32`	`"-P" => [ true, "Specify the password to access msfrpcd" ],`
`33`		`- "-t" => [ true, "Type of RPC daemon, [XML\|Msg]" ],`
`34`	`33`	`"-S" => [ false, "Disable SSL on the RPC socket" ],`
`35`	`34`	`"-h" => [ false, "Help banner" ]`
`36`	`35`	`)`