General cleanups, bug fixes, removal of debugging statements.

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

lib/msf/base/simple/auxiliary.rb

@@ -56,9 +56,6 @@ module Auxiliary
 		# Initialize user interaction
 		mod.init_ui(opts['LocalInput'],opts['LocalOutput'])
 
-		
-		p mod.passive?
-		
 		if(mod.passive?)		
 			mod.framework.jobs.start_bg_job(
 				"Auxiliary: #{mod.refname}", 

lib/msf/core/exploit/tcp.rb

@@ -330,12 +330,17 @@ module Exploit::Remote::TcpServer
 		rescue ::Errno::EACCES => e
 			if (srvport.to_i < 1024)
 				print_line(" ")
+				print_error("Could not start the TCP server: #{e.to_s}.")
 				print_error(
-					"Could not start the TCP server: #{e.to_s}. " +
 					"This module is configured to use a privileged TCP port (#{srvport}). " +
 					"On Unix systems, only the root user account is allowed to bind to privileged ports." +
 					"Please run the framework as root to use this module."
 				)
+				print_error(
+					"On Microsoft Windows systems, this error is returned when a process attempts to "+
+					"listen on a host/port combination that is already in use. For example, Windows XP "+
+					"will return this error if a process attempts to bind() over the system SMB/NetBIOS services."
+				)
 				print_line(" ")
 			end
 			raise e

lib/ole/file_system.rb

@@ -111,7 +111,7 @@ module Ole
 			# mkdir, and rmdir are the main ones we'd need to support
 			def rmdir path
 				dirent = @ole.dirent_from_path path
-				p dirent
+
 				# repeating myself
 				raise "#{path.inspect} is not a directory" unless dirent.dir?
 				# ENOTEMPTY:

lib/rex/arch.rb

@@ -66,8 +66,6 @@ module Arch
 				return ENDIAN_BIG
 		end
 		
-		p "XXXXXXXXXXXXXXXXXXX"
-		p arch 
 		return ENDIAN_LITTLE
 	end
 

lib/rex/peparsey/pebase.rb

@@ -1457,26 +1457,32 @@ class PeBase
 	
 	def _resource_lookup(i)
     	tbl = {
-			'1'      => 'CURSOR',
-			'2'      => 'BITMAP',
-			'3'      => 'ICON',
-			'4'      => 'MENU',
-			'5'      => 'DIALOG',
-			'6'      => 'STRING',
-			'7'      => 'FONTDIR',
-			'8'      => 'FONT',
-			'9'      => 'ACCELERATORS',
-			'10'     => 'RCDATA',
-			'11'     => 'MESSAGETABLE',
-			'12'     => 'GROUP_CURSOR',
-			'14'     => 'GROUP_ICON',
-			'16'     => 'VERSION',
+			'1'      => 'RT_CURSOR',
+			'2'      => 'RT_BITMAP',
+			'3'      => 'RT_ICON',
+			'4'      => 'RT_MENU',
+			'5'      => 'RT_DIALOG',
+			'6'      => 'RT_STRING',
+			'7'      => 'RT_FONTDIR',
+			'8'      => 'RT_FONT',
+			'9'      => 'RT_ACCELERATORS',
+			'10'     => 'RT_RCDATA',
+			'11'     => 'RT_MESSAGETABLE',
+			'12'     => 'RT_GROUP_CURSOR',
+			'14'     => 'RT_GROUP_ICON',
+			'16'     => 'RT_VERSION',
+			'17'     => 'RT_DLGINCLUDE',
+			'19'     => 'RT_PLUGPLAY',
+			'20'     => 'RT_VXD',
+			'21'     => 'RT_ANICURSOR',
+			'22'     => 'RT_ANIICON',
 			'23'     => 'RT_HTML',
-			'32767'  => 'ERROR',
-			'8192'   => 'NEWRESOURCE',
-			'8194'   => 'NEWBITMAP',
-			'8196'   => 'NEWMENU',
-			'8197'   => 'NEWDIALOG'
+			'24'     => 'RT_MANIFEST',
+			'32767'  => 'RT_ERROR',
+			'8192'   => 'RT_NEWRESOURCE',
+			'8194'   => 'RT_NEWBITMAP',
+			'8196'   => 'RT_NEWMENU',
+			'8197'   => 'RT_NEWDIALOG'
 		}
 		tbl[i] || i
 	end