Out of 4.4.0, and into 4.5.0-dev

Notably, DisclosureDate is required for other module parsers, so let's
not ignore those, even if you have to guess at the disclosure or call
the module's publish date the disclosure date.

lib/msf/core/framework.rb

@@ -17,9 +17,9 @@ class Framework
 	#
 
 	Major    = 4
-	Minor    = 4
+	Minor    = 5
 	Point    = 0
-	Release  = "-release"
+	Release  = "-dev"
 
 	if(Point)
 		Version  = "#{Major}.#{Minor}.#{Point}#{Release}"

modules/auxiliary/admin/mssql/mssql_sql_file.rb

@@ -5,7 +5,7 @@
 #   http://metasploit.com/
 ##
 
-require 'msf/core' 
+require 'msf/core'
 
 class Metasploit3 < Msf::Auxiliary
 
@@ -13,10 +13,11 @@ class Metasploit3 < Msf::Auxiliary
 
 	def initialize(info = {})
 		super(update_info(info,
-			'Name'           => 'MSSQL - Execute SQL from file',
+			'Name'           => 'Microsoft SQL Server Generic Query from File',
 			'Description'    => %q{
-				This module will allow for multiple SQL queries contained within a specified 
-				file to be executed against a MSSQL instance given the appropiate credentials.
+				This module will allow for multiple SQL queries contained within a specified
+				file to be executed against a Microsoft SQL (MSSQL) Server instance, given
+				the appropiate credentials.
 			},
 			'Author'         => [ 'j0hn__f : <jf[at]tinternet.org.uk>' ],
 			'License'        => MSF_LICENSE

modules/auxiliary/scanner/sap/sap_mgmt_con_getprocesslist.rb

@@ -25,7 +25,7 @@ class Metasploit4 < Msf::Auxiliary
 					[ 'URL', 'http://blog.c22.cc' ]
 				],
 			'Author'       =>
-				[ 
+				[
 					'Chris John Riley', # most of the code this module is based on
 					'Bruno Morisson <bm[at]integrity.pt>' # request ProcessList and parsing output
 				],

modules/exploits/multi/http/webpagetest_upload_exec.rb

@@ -66,7 +66,7 @@ class Metasploit3 < Msf::Exploit::Remote
 		res2 = send_request_raw({'uri'=>"#{base}/work/resultimage.php"})
 
 		if res1 and res1.body =~ /WebPagetest \- Website Performance and Optimization Test/ and
-		   res2 and res2.code == 200
+			res2 and res2.code == 200
 			return Exploit::CheckCode::Vulnerable
 		end
 
@@ -123,4 +123,4 @@ class Metasploit3 < Msf::Exploit::Remote
 			print_error("#{peer} - Payload failed to upload")
 		end
 	end
-end
+end

modules/exploits/unix/local/setuid_nmap.rb

@@ -21,7 +21,7 @@ class Metasploit4 < Msf::Exploit::Local
 
 	def initialize(info={})
 		super( update_info( info, {
-				'Name'          => 'setuid nmap "exploit"',
+				'Name'          => 'Setuid Nmap Exploit',
 				'Description'   => %q{
 					Nmap's man page mentions that "Nmap should never be installed with
 					special privileges (e.g. suid root) for security reasons.." and
@@ -36,6 +36,7 @@ class Metasploit4 < Msf::Exploit::Local
 				},
 				'License'       => MSF_LICENSE,
 				'Author'        => [ 'egypt' ],
+				'DisclosureDate' => 'Jul 19 2012',
 				'Platform'      => [ 'unix', 'linux', 'bsd' ],
 				'Arch'          => [ ARCH_CMD, ARCH_X86 ],
 				'SessionTypes'  => [ 'shell', 'meterpreter' ],

modules/exploits/windows/http/sonicwall_scrutinizer_sqli.rb

@@ -64,7 +64,7 @@ class Metasploit3 < Msf::Exploit::Remote
 	def check
 		res = send_request_raw({'uri'=>target_uri.host})
 		if res and res.body =~ /\<title\>Scrutinizer\<\/title\>/ and
-		           res.body =~ /\<div id\=\'.+\'\>Scrutinizer 9\.[0-5]\.[0-1]\<\/div\>/
+			res.body =~ /\<div id\=\'.+\'\>Scrutinizer 9\.[0-5]\.[0-1]\<\/div\>/
 			return Exploit::CheckCode::Vulnerable
 		end
 

modules/exploits/windows/local/current_user_psexec.rb

@@ -14,6 +14,8 @@ require 'rex'
 require 'msf/core/post/windows/services'
 
 class Metasploit3 < Msf::Exploit::Local
+	Rank = ExcellentRanking
+
 	include Post::Windows::WindowsServices
 	include Exploit::EXE
 	include Post::File
@@ -21,7 +23,7 @@ class Metasploit3 < Msf::Exploit::Local
 
 	def initialize(info={})
 		super( update_info( info,
-				'Name'          => 'Psexec via Current User Token',
+				'Name'          => 'PsExec via Current User Token',
 				'Description'   => %q{
 					This module uploads an executable file to the victim system, creates
 					a share containing that executable, creates a remote service on each
@@ -43,6 +45,7 @@ class Metasploit3 < Msf::Exploit::Local
 						[ 'OSVDB', '3106'],
 						[ 'URL', 'http://www.microsoft.com/technet/sysinternals/utilities/psexec.mspx' ]
 					],
+				'DisclosureDate' => 'Jan 01 1999',
 				'Version'       => '$Revision$',
 				'Platform'      => [ 'windows' ],
 				'SessionTypes'  => [ 'meterpreter' ],