dnrops
/
metasploit-framework
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

General cleanups, bug fixes, removal of debugging statements. 

git-svn-id: file:///home/svn/framework3/trunk@5051 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
HD Moore 2007-07-16 02:17:32 +00:00
parent 2fd4bf1579
commit 1f2791494b
6 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/metasm/.hg/dirstate
View File

Binary file not shown.

3
lib/msf/base/simple/auxiliary.rb
View File

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

7
lib/msf/core/exploit/tcp.rb
View File

@ -330,12 +330,17 @@ module Exploit::Remote::TcpServer
rescue ::Errno::EACCES => e rescue ::Errno::EACCES => e
if (srvport.to_i < 1024) if (srvport.to_i < 1024)
print_line(" ") print_line(" ")
print_error("Could not start the TCP server: #{e.to_s}.")
print_error( print_error(
"Could not start the TCP server: #{e.to_s}. " +
"This module is configured to use a privileged TCP port (#{srvport}). " + "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." + "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." "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(" ") print_line(" ")
end end
raise e raise e

2
lib/ole/file_system.rb
View File

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

2
lib/rex/arch.rb
View File

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

44
lib/rex/peparsey/pebase.rb
View File

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