Re-org

git-svn-id: file:///home/svn/framework3/trunk@3821 4d416f70-5f16-0410-b530-b9f4589650da

modules/auxiliary/scanner/scanner_batch.rb

@@ -2,7 +2,7 @@ require 'msf/core'
 
 module Msf
 
-class Auxiliary::ScannerBatchTest < Msf::Auxiliary
+class Auxiliary::Scanner::BatchTest < Msf::Auxiliary
 
 	include Auxiliary::Scanner
 	

modules/auxiliary/scanner/scanner_host.rb

@@ -2,7 +2,7 @@ require 'msf/core'
 
 module Msf
 
-class Auxiliary::ScannerHostTest < Msf::Auxiliary
+class Auxiliary::Scanner::HostTest < Msf::Auxiliary
 
 	include Auxiliary::Scanner
 	

modules/auxiliary/scanner/scanner_range.rb

@@ -2,7 +2,7 @@ require 'msf/core'
 
 module Msf
 
-class Auxiliary::ScannerRangeTest < Msf::Auxiliary
+class Auxiliary::Scanner::RangeTest < Msf::Auxiliary
 
 	include Auxiliary::Scanner
 	

modules/auxiliary/scanner/smb/version.rb

@@ -0,0 +1,42 @@
+require 'msf/core'
+
+module Msf
+
+class Auxiliary::Scanner::Smb::Version < Msf::Auxiliary
+
+	include Auxiliary::Scanner
+	include Exploit::Remote::SMB
+	
+	def initialize
+		super(
+			'Name'        => 'SMB Version Detection',
+			'Version'     => '$Revision: 3624 $',
+			'Description' => 'Display version information about each system',
+			'Author'      => 'hdm',
+			'License'     => MSF_LICENSE
+		)
+
+		register_options(
+			[
+				OptAddress.new('RHOST',  [ false,  "Ignore me please" ])
+			], self.class)	
+
+	end
+
+	def run_host(ip)
+		print_status("Working on host #{ip}")
+		datastore['RHOST'] = ip
+		
+		begin
+			connect()
+			smb_login()
+ 			print_status("#{ip} OS=#{smb_peer_os()} LM=#{smb_peer_lm()}")
+			disconnect()
+		
+		rescue
+		end
+		
+	end
+
+end
+end