Massive whitespace cleanup

modules/auxiliary/admin/backupexec/dump.rb

@@ -282,4 +282,3 @@ def run
 	end
 
 end
-

modules/auxiliary/admin/backupexec/registry.rb

@@ -280,4 +280,4 @@ def backupexec_regrpc_write(opts = {})
 		return stub
 	end
 
-end
+end

modules/auxiliary/admin/cisco/vpn_3000_ftp_bypass.rb

@@ -82,4 +82,4 @@ def run
 		end
 		disconnect
 	end
-end
+end

modules/auxiliary/admin/edirectory/edirectory_dhost_cookie.rb

@@ -87,4 +87,3 @@ def run
 	end
 
 end
-

modules/auxiliary/admin/edirectory/edirectory_edirutil.rb

@@ -153,4 +153,4 @@ def run
 
 		disconnect
 	end
-end
+end

modules/auxiliary/admin/http/hp_web_jetadmin_exec.rb

@@ -58,4 +58,3 @@ def run
 	end
 
 end
-

modules/auxiliary/admin/http/iomega_storcenterpro_sessionid.rb

@@ -64,4 +64,3 @@ def run
 		end
 	end
 end
-

modules/auxiliary/admin/http/typo3_sa_2009_001.rb

@@ -155,4 +155,4 @@ def run
 
 	end
 
-end
+end

modules/auxiliary/admin/http/typo3_sa_2010_020.rb

@@ -139,4 +139,4 @@ def run
 
 	end
 
-end
+end

modules/auxiliary/admin/http/typo3_winstaller_default_enc_keys.rb

@@ -208,4 +208,4 @@ def run
 
 	end
 
-end
+end

modules/auxiliary/admin/mssql/mssql_exec.rb

@@ -42,4 +42,3 @@ def run
 		mssql_xpcmdshell(datastore['CMD'], true) if mssql_login_datastore
 	end
 end
-

modules/auxiliary/admin/mssql/mssql_idf.rb

@@ -230,4 +230,3 @@ def run
 		disconnect
 	end
 end
-

modules/auxiliary/admin/mysql/mysql_enum.rb

@@ -216,4 +216,3 @@ def run
 	end
 
 end
-

modules/auxiliary/admin/mysql/mysql_sql.rb

@@ -45,4 +45,3 @@ def run
 	end
 
 end
-

modules/auxiliary/admin/oracle/oracle_login.rb

@@ -75,4 +75,3 @@ def run
 		end
 	end
 end
-

modules/auxiliary/admin/pop2/uw_fileretrieval.rb

@@ -62,4 +62,4 @@ def run
 		disconnect
 	end
 
-end
+end

modules/auxiliary/admin/smb/check_dir_file.rb

@@ -95,5 +95,3 @@ def run_host(ip)
 	end
 
 end
-
-

modules/auxiliary/admin/smb/samba_symlink_traversal.rb

@@ -72,4 +72,3 @@ def run
 	end
 
 end
-

modules/auxiliary/admin/smb/upload_file.rb

@@ -74,4 +74,3 @@ def run
 	end
 
 end
-

modules/auxiliary/admin/tftp/tftp_transfer_util.rb

@@ -222,4 +222,3 @@ def print_tftp_status(msg)
 	end
 
 end
-

modules/auxiliary/admin/vmware/poweroff_vm.rb

@@ -23,8 +23,8 @@ def initialize
 		super(
 			'Name'           => 'VMWare Power Off Virtual Machine',
 			'Description'    => %Q{
-							This module will log into the Web API of VMWare and try to power off
-							a specified Virtual Machine.},
+				This module will log into the Web API of VMWare and try to power off
+				a specified Virtual Machine.},
 			'Author'         => ['TheLightCosine <thelightcosine[at]metasploit.com>'],
 			'License'        => MSF_LICENSE
 		)
@@ -66,10 +66,4 @@ def run
 			return
 		end
 	end
-
-
-
-
-
 end
-

modules/auxiliary/admin/vmware/poweron_vm.rb

@@ -73,4 +73,3 @@ def run
 
 
 end
-

modules/auxiliary/admin/vmware/tag_vm.rb

@@ -23,9 +23,10 @@ def initialize
 		super(
 			'Name'           => 'VMWare Tag Virtual Machine',
 			'Description'    => %Q{
-							This module will log into the Web API of VMWare and
-							'tag' a specified Virtual Machine. It does this by
-							logging a user event with user supplied text},
+				This module will log into the Web API of VMWare and
+				'tag' a specified Virtual Machine. It does this by
+				logging a user event with user supplied text
+			},
 			'Author'         => ['TheLightCosine <thelightcosine[at]metasploit.com>'],
 			'License'        => MSF_LICENSE
 		)
@@ -72,9 +73,4 @@ def run
 		end
 	end
 
-
-
-
-
 end
-

modules/auxiliary/admin/vmware/terminate_esx_sessions.rb

@@ -23,8 +23,8 @@ def initialize
 		super(
 			'Name'           => 'VMWare Terminate ESX Login Sessions',
 			'Description'    => %Q{
-							This module will log into the Web API of VMWare and try to terminate
-							user login sessions as specified by the session keys.},
+				This module will log into the Web API of VMWare and try to terminate
+				user login sessions as specified by the session keys.},
 			'Author'         => ['TheLightCosine <thelightcosine[at]metasploit.com>'],
 			'License'        => MSF_LICENSE
 		)
@@ -60,8 +60,4 @@ def run
 		end
 	end
 
-
-
-
 end
-

modules/auxiliary/admin/vxworks/apple_airport_extreme_password.rb

@@ -114,4 +114,3 @@ def run
 		wdbrpc_client_disconnect
 	end
 end
-

modules/auxiliary/admin/vxworks/dlink_i2eye_autoanswer.rb

@@ -96,4 +96,3 @@ def run
 	end
 
 end
-

modules/auxiliary/admin/vxworks/wdbrpc_memory_dump.rb

@@ -116,4 +116,3 @@ def run
 	end
 
 end
-

modules/auxiliary/admin/vxworks/wdbrpc_reboot.rb

@@ -66,4 +66,3 @@ def run_host(ip)
 	end
 
 end
-

modules/auxiliary/admin/webmin/file_disclosure.rb

@@ -84,4 +84,4 @@ def run
 		end
 	end
 
-end
+end

modules/auxiliary/analyze/jtr_crack_fast.rb

@@ -160,4 +160,3 @@ def run
 		end
 	end
 end
-

modules/auxiliary/analyze/jtr_mysql_fast.rb

@@ -158,4 +158,3 @@ def crack(format)
 	end
 
 end
-

modules/auxiliary/bnat/bnat_router.rb

@@ -153,4 +153,3 @@ def arp2(target_ip,int)
 		return target_mac
 	end
 end
-

modules/auxiliary/bnat/bnat_scan.rb

@@ -6,7 +6,7 @@
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
 # web site for more information on licensing and terms of use.
-#   http://metasploit.com/
+#	http://metasploit.com/
 ##
 
 require 'msf/core'
@@ -36,7 +36,7 @@ def initialize
 					[ 'URL', 'http://www.slideshare.net/claudijd/dc-skytalk-bnat-hijacking-repairing-broken-communication-channels'],
 				]
 		)
-		
+
 		register_options(
 				[
 					OptString.new('PORTS', [true, "Ports to scan (e.g. 22-25,80,110-900)", "21,22,23,80,443"]),
@@ -49,42 +49,41 @@ def initialize
 	end
 
 	def probe_reply(pcap, to)
-                reply = nil
-                begin
-                        Timeout.timeout(to) do
-                                pcap.each do |r|
-                                        pkt = PacketFu::Packet.parse(r)
-                                        next unless pkt.is_tcp?
-                                        reply = pkt
-                                        break
-                                end
-                        end
-                rescue Timeout::Error
-                end
-                return reply
+		reply = nil
+		begin
+			Timeout.timeout(to) do
+				pcap.each do |r|
+					pkt = PacketFu::Packet.parse(r)
+					next unless pkt.is_tcp?
+					reply = pkt
+					break
+				end
+			end
+			rescue Timeout::Error
+		end
+		return reply
 	end
 
 	def generate_probe(ip)
-                ftypes = %w{windows, linux, freebsd}
-                @flavor = ftypes[rand(ftypes.length)]
-                config = PacketFu::Utils.whoami?(:iface => datastore['INTERFACE'])
-                p = PacketFu::TCPPacket.new(:config => config)
-                p.ip_daddr = ip
-                p.tcp_flags.syn = 1
+		ftypes = %w{windows, linux, freebsd}
+		@flavor = ftypes[rand(ftypes.length)]
+		config = PacketFu::Utils.whoami?(:iface => datastore['INTERFACE'])
+		p = PacketFu::TCPPacket.new(:config => config)
+		p.ip_daddr = ip
+		p.tcp_flags.syn = 1
 		return p
 	end
 
 	def run_host(ip)
-
 		open_pcap
-		
+
 		to = (datastore['TIMEOUT'] || 500).to_f / 1000.0
 
 		p = generate_probe(ip)
 		pcap = self.capture
 
 		ports = Rex::Socket.portspec_crack(datastore['PORTS'])
-		
+
 		ports.each_with_index do |port,i|
 			p.tcp_dst = port
 			p.tcp_src = rand(64511)+1024
@@ -96,12 +95,11 @@ def run_host(ip)
 			capture_sendto(p, ip)
 			reply = probe_reply(pcap, to)
 			next if reply.nil?
-			
+
 			print_status("[BNAT RESPONSE] Requested IP: #{ip} Responding IP: #{reply.ip_saddr} Port: #{reply.tcp_src}")
-    end
-
-		close_pcap		
-
+		end
+
+		close_pcap
 	end
-end
 
+end

modules/auxiliary/crawler/msfcrawler.rb

@@ -451,11 +451,3 @@ def targetinipath
 		self.crawler.cinipath
 	end
 end
-
-
-
-
-
-
-
-

modules/auxiliary/dos/mdns/avahi_portzero.rb

@@ -59,4 +59,3 @@ def run
 		print_status("Avahi should be down now")
 	end
 end
-

modules/auxiliary/dos/ntp/ntpd_reserved_dos.rb

@@ -69,4 +69,3 @@ def run_host(ip)
 	end
 
 end
-

modules/auxiliary/dos/pptp/ms02_063_pptp_dos.rb

@@ -71,4 +71,4 @@ def run
 
 		disconnect
 	end
-end
+end

modules/auxiliary/dos/scada/beckhoff_twincat.rb

@@ -63,7 +63,7 @@ def run
 TCATSysSrv+0x14f6a:
 00414f6a 66833802        cmp     word ptr [eax],2         ds:0023:02a1f9cf=????
 0:016> k
-ChildEBP RetAddr  
+ChildEBP RetAddr
 WARNING: Stack unwind information not available. Following frames may be wrong.
 02a0f7f8 71ab265b TCATSysSrv+0x14f6a
 02a0f80c 71ab4a9e WS2_32!Prolog_v1+0x21
@@ -73,4 +73,4 @@ def run
 02a0f938 71ad303a WS2_32!WSARecvFrom+0x7d
 02a0f96c 00414b92 WSOCK32!recvfrom+0x39
 02a0f988 00000000 TCATSysSrv+0x14b92
-=end
+=end

modules/auxiliary/dos/syslog/rsyslog_long_tag.rb

@@ -52,4 +52,3 @@ def run
 		disconnect_udp
 	end
 end
-

modules/auxiliary/dos/tcp/synflood.rb

@@ -74,4 +74,3 @@ def run
 		close_pcap
 	end
 end
-

modules/auxiliary/dos/wifi/file2air.rb

@@ -115,4 +115,3 @@ def substaddr3(frame, addr)
 		frame[16,6] = eton(addr) if addr
 	end
 end
-

modules/auxiliary/dos/windows/browser/ms09_065_eot_integer.rb

@@ -165,4 +165,3 @@ def on_request_uri(cli, request)
 bf87c9df 8a6702          mov     ah,byte ptr [edi+2]  <--- the crash above
 
 =end
-

modules/auxiliary/dos/windows/ftp/filezilla_admin_user.rb

@@ -51,4 +51,4 @@ def run
 		end
 	end
 
-end
+end