Adds fastlib and lib/metasploit.fastlib to the include path

red0xff · Nov 21, 2011 · bfc32f4 · bfc32f4
1 parent 8a4ee90
commit bfc32f4
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 2 deletions.
diff --git a/msfbinscan b/msfbinscan
@@ -10,6 +10,10 @@ while File.symlink?(msfbase)
 end
 
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+require 'fastlib'
+
+$:.unshift(File.join(File.dirname(msfbase), 'lib', 'metasploit.fastlib'))
+
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'metasm'
@@ -292,4 +296,4 @@ files.each do |file|
 		$stderr.puts("Skipping #{file}")
 		next
 	end
-end
+end
diff --git a/msfcli b/msfcli
@@ -15,6 +15,10 @@ while File.symlink?(msfbase)
 end
 
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+require 'fastlib'
+
+$:.unshift(File.join(File.dirname(msfbase), 'lib', 'metasploit.fastlib'))
+
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'

diff --git a/msfconsole b/msfconsole
@@ -13,7 +13,11 @@ while File.symlink?(msfbase)
 	msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
-$:.unshift(File.join(File.expand_path(File.dirname(msfbase)), 'lib'))
+$:.unshift(File.join(File.dirname(msfbase), 'lib'))
+require 'fastlib'
+
+$:.unshift(File.join(File.dirname(msfbase), 'lib', 'metasploit.fastlib'))
+
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'optparse'

diff --git a/msfd b/msfd
@@ -16,6 +16,10 @@ while File.symlink?(msfbase)
 end
 
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+require 'fastlib'
+
+$:.unshift(File.join(File.dirname(msfbase), 'lib', 'metasploit.fastlib'))
+
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'msf/base'

diff --git a/msfelfscan b/msfelfscan
@@ -10,6 +10,10 @@ while File.symlink?(msfbase)
 end
 
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+require 'fastlib'
+
+$:.unshift(File.join(File.dirname(msfbase), 'lib', 'metasploit.fastlib'))
+
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex/elfparsey'

diff --git a/msfencode b/msfencode
@@ -10,6 +10,10 @@ while File.symlink?(msfbase)
 end
 
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+require 'fastlib'
+
+$:.unshift(File.join(File.dirname(msfbase), 'lib', 'metasploit.fastlib'))
+
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'

diff --git a/msfmachscan b/msfmachscan
@@ -10,6 +10,10 @@ while File.symlink?(msfbase)
 end
 
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+require 'fastlib'
+
+$:.unshift(File.join(File.dirname(msfbase), 'lib', 'metasploit.fastlib'))
+
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex/machparsey'

diff --git a/msfopcode b/msfopcode
@@ -15,6 +15,10 @@ while File.symlink?(msfbase)
 end
 
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+require 'fastlib'
+
+$:.unshift(File.join(File.dirname(msfbase), 'lib', 'metasploit.fastlib'))
+
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'

diff --git a/msfpayload b/msfpayload
@@ -10,6 +10,10 @@ while File.symlink?(msfbase)
 end
 
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+require 'fastlib'
+
+$:.unshift(File.join(File.dirname(msfbase), 'lib', 'metasploit.fastlib'))
+
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'

diff --git a/msfpescan b/msfpescan
@@ -10,6 +10,10 @@ while File.symlink?(msfbase)
 end
 
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+require 'fastlib'
+
+$:.unshift(File.join(File.dirname(msfbase), 'lib', 'metasploit.fastlib'))
+
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex/peparsey'

diff --git a/msfrop b/msfrop
@@ -13,6 +13,10 @@ while File.symlink?(msfbase)
 end
 
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+require 'fastlib'
+
+$:.unshift(File.join(File.dirname(msfbase), 'lib', 'metasploit.fastlib'))
+
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'

diff --git a/msfrpc b/msfrpc
@@ -14,6 +14,10 @@ while File.symlink?(msfbase)
 end
 
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+require 'fastlib'
+
+$:.unshift(File.join(File.dirname(msfbase), 'lib', 'metasploit.fastlib'))
+
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex/parser/arguments'

diff --git a/msfrpcd b/msfrpcd
@@ -14,6 +14,10 @@ while File.symlink?(msfbase)
 end
 
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+require 'fastlib'
+
+$:.unshift(File.join(File.dirname(msfbase), 'lib', 'metasploit.fastlib'))
+
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex/parser/arguments'

diff --git a/msfvenom b/msfvenom
@@ -9,6 +9,10 @@ while File.symlink?(msfbase)
 end
 
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+require 'fastlib'
+
+$:.unshift(File.join(File.dirname(msfbase), 'lib', 'metasploit.fastlib'))
+
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 Status = "[*] "