From f4498c3916cac4fb0606903660cdc104f34edee3 Mon Sep 17 00:00:00 2001
From: James Lee <egypt@metasploit.com>
Date: Mon, 20 May 2013 16:21:03 -0500
Subject: [PATCH 1/3] Remove $Id tags

Also adds binary coding magic comment to a few files
---
 lib/msf/base/sessions/command_shell_options.rb               | 3 ---
 lib/msf/base/sessions/meterpreter.rb                         | 1 -
 lib/msf/base/sessions/meterpreter_java.rb                    | 1 -
 lib/msf/base/sessions/meterpreter_options.rb                 | 1 -
 lib/msf/base/sessions/meterpreter_php.rb                     | 1 -
 lib/msf/base/sessions/meterpreter_x86_bsd.rb                 | 1 -
 lib/msf/base/sessions/meterpreter_x86_linux.rb               | 1 -
 lib/msf/base/sessions/meterpreter_x86_win.rb                 | 1 -
 lib/msf/base/sessions/tty.rb                                 | 1 -
 lib/msf/base/sessions/vncinject_options.rb                   | 3 ---
 lib/msf/base/simple/buffer.rb                                | 1 -
 lib/msf/base/simple/payload.rb                               | 1 -
 lib/msf/core/auxiliary/commandshell.rb                       | 1 -
 lib/msf/core/auxiliary/login.rb                              | 3 ---
 lib/msf/core/auxiliary/pii.rb                                | 3 ---
 lib/msf/core/auxiliary/rservices.rb                          | 3 ---
 lib/msf/core/encoded_payload.rb                              | 1 -
 lib/msf/core/exploit/browser_autopwn.rb                      | 1 -
 lib/msf/core/exploit/cmdstager.rb                            | 1 -
 lib/msf/core/exploit/cmdstager_debug_asm.rb                  | 1 -
 lib/msf/core/exploit/cmdstager_debug_write.rb                | 1 -
 lib/msf/core/exploit/cmdstager_tftp.rb                       | 1 -
 lib/msf/core/exploit/cmdstager_vbs.rb                        | 1 -
 lib/msf/core/exploit/cmdstager_vbs_adodb.rb                  | 1 -
 lib/msf/core/exploit/dhcp.rb                                 | 1 -
 lib/msf/core/exploit/egghunter.rb                            | 1 -
 lib/msf/core/exploit/exe.rb                                  | 3 ---
 lib/msf/core/exploit/fmtstr.rb                               | 1 -
 lib/msf/core/exploit/ipv6.rb                                 | 3 ---
 lib/msf/core/exploit/mixins.rb                               | 1 -
 lib/msf/core/exploit/mysql.rb                                | 3 ---
 lib/msf/core/exploit/omelet.rb                               | 1 -
 lib/msf/core/exploit/pdf.rb                                  | 3 ---
 lib/msf/core/exploit/php_exe.rb                              | 3 ---
 lib/msf/core/exploit/riff.rb                                 | 3 ---
 lib/msf/core/exploit/tcp.rb                                  | 4 +++-
 lib/msf/core/exploit/telnet.rb                               | 3 ---
 lib/msf/core/exploit/tftp.rb                                 | 1 -
 lib/msf/core/exploit/wbemexec.rb                             | 3 ---
 lib/msf/core/payload/generic.rb                              | 5 +++++
 lib/msf/core/payload/windows/exec.rb                         | 3 ---
 lib/msf/core/payload/windows/loadlibrary.rb                  | 3 ---
 lib/msf/core/rpc/v10/rpc_module.rb                           | 3 ---
 lib/msf/ui/console/command_dispatcher/payload.rb             | 1 -
 lib/msf/windows_error.rb                                     | 3 ---
 lib/rex/elfparsey.rb                                         | 2 --
 lib/rex/elfparsey/elf.rb                                     | 2 --
 lib/rex/elfparsey/elfbase.rb                                 | 2 --
 lib/rex/elfparsey/exceptions.rb                              | 2 --
 lib/rex/elfscan.rb                                           | 2 --
 lib/rex/elfscan/scanner.rb                                   | 2 --
 lib/rex/elfscan/search.rb                                    | 2 --
 lib/rex/exploitation/cmdstager/tftp.rb                       | 1 -
 lib/rex/exploitation/jsobfu.rb                               | 1 -
 lib/rex/image_source.rb                                      | 2 --
 lib/rex/image_source/disk.rb                                 | 2 --
 lib/rex/image_source/image_source.rb                         | 2 --
 lib/rex/image_source/memory.rb                               | 2 --
 lib/rex/ole.rb                                               | 4 ----
 lib/rex/ole/clsid.rb                                         | 4 ----
 lib/rex/ole/difat.rb                                         | 4 ----
 lib/rex/ole/directory.rb                                     | 4 ----
 lib/rex/ole/direntry.rb                                      | 4 ----
 lib/rex/ole/fat.rb                                           | 4 ----
 lib/rex/ole/header.rb                                        | 4 ----
 lib/rex/ole/minifat.rb                                       | 4 ----
 lib/rex/ole/propset.rb                                       | 4 ----
 lib/rex/ole/storage.rb                                       | 4 ----
 lib/rex/ole/stream.rb                                        | 4 ----
 lib/rex/ole/substorage.rb                                    | 4 ----
 lib/rex/ole/util.rb                                          | 4 ----
 lib/rex/peparsey.rb                                          | 2 --
 lib/rex/peparsey/exceptions.rb                               | 2 --
 lib/rex/peparsey/pe.rb                                       | 2 --
 lib/rex/peparsey/pe_memdump.rb                               | 2 --
 lib/rex/peparsey/pebase.rb                                   | 2 --
 lib/rex/peparsey/section.rb                                  | 2 --
 lib/rex/pescan.rb                                            | 2 --
 lib/rex/proto/dhcp.rb                                        | 1 -
 lib/rex/proto/dhcp/constants.rb                              | 1 -
 lib/rex/proto/dhcp/server.rb                                 | 1 -
 lib/rex/proto/ntlm/crypt.rb                                  | 4 ----
 lib/rex/proto/ntlm/message.rb                                | 3 ---
 lib/rex/proto/rfb.rb                                         | 1 -
 lib/rex/proto/rfb.rb.ut.rb                                   | 2 --
 lib/rex/proto/rfb/cipher.rb                                  | 3 ---
 lib/rex/proto/rfb/client.rb                                  | 3 ---
 lib/rex/proto/rfb/constants.rb                               | 3 ---
 lib/rex/proto/tftp.rb                                        | 1 -
 lib/rex/proto/tftp/constants.rb                              | 1 -
 lib/rex/proto/tftp/server.rb                                 | 1 -
 lib/rex/proto/tftp/server.rb.ut.rb                           | 5 -----
 lib/rex/zip/archive.rb                                       | 3 ---
 lib/rex/zip/blocks.rb                                        | 3 ---
 lib/rex/zip/entry.rb                                         | 3 ---
 modules/auxiliary/server/capture/drda.rb                     | 4 +---
 modules/exploits/freebsd/telnet/telnet_encrypt_keyid.rb      | 4 +---
 modules/exploits/linux/telnet/telnet_encrypt_keyid.rb        | 4 +---
 .../exploits/multi/http/jboss_deploymentfilerepository.rb    | 4 +---
 .../windows/browser/novelliprint_getdriversettings.rb        | 4 +---
 .../exploits/windows/misc/citrix_streamprocess_data_msg.rb   | 4 +---
 modules/post/windows/gather/credentials/imvu.rb              | 4 +---
 modules/post/windows/gather/credentials/outlook.rb           | 2 +-
 modules/post/windows/recon/resolve_ip.rb                     | 4 +---
 104 files changed, 17 insertions(+), 232 deletions(-)

diff --git a/lib/msf/base/sessions/command_shell_options.rb b/lib/msf/base/sessions/command_shell_options.rb
index 028ce427ab..a170e6f4f5 100644
--- a/lib/msf/base/sessions/command_shell_options.rb
+++ b/lib/msf/base/sessions/command_shell_options.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 ##
 # This file is part of the Metasploit Framework and may be subject to
diff --git a/lib/msf/base/sessions/meterpreter.rb b/lib/msf/base/sessions/meterpreter.rb
index 2f8b79580a..84b827933d 100644
--- a/lib/msf/base/sessions/meterpreter.rb
+++ b/lib/msf/base/sessions/meterpreter.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base'
 require 'msf/base/sessions/scriptable'
diff --git a/lib/msf/base/sessions/meterpreter_java.rb b/lib/msf/base/sessions/meterpreter_java.rb
index c92e58e782..2c393c31fd 100644
--- a/lib/msf/base/sessions/meterpreter_java.rb
+++ b/lib/msf/base/sessions/meterpreter_java.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/meterpreter'
 
diff --git a/lib/msf/base/sessions/meterpreter_options.rb b/lib/msf/base/sessions/meterpreter_options.rb
index c44b8c6f5e..16942f0270 100644
--- a/lib/msf/base/sessions/meterpreter_options.rb
+++ b/lib/msf/base/sessions/meterpreter_options.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'shellwords'
 
diff --git a/lib/msf/base/sessions/meterpreter_php.rb b/lib/msf/base/sessions/meterpreter_php.rb
index 2ba47c2c03..98e564567b 100644
--- a/lib/msf/base/sessions/meterpreter_php.rb
+++ b/lib/msf/base/sessions/meterpreter_php.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/meterpreter'
 
diff --git a/lib/msf/base/sessions/meterpreter_x86_bsd.rb b/lib/msf/base/sessions/meterpreter_x86_bsd.rb
index 1f851e270c..d6fb7b27d8 100644
--- a/lib/msf/base/sessions/meterpreter_x86_bsd.rb
+++ b/lib/msf/base/sessions/meterpreter_x86_bsd.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/meterpreter'
 
diff --git a/lib/msf/base/sessions/meterpreter_x86_linux.rb b/lib/msf/base/sessions/meterpreter_x86_linux.rb
index 33e72d1be9..45ba0b910a 100644
--- a/lib/msf/base/sessions/meterpreter_x86_linux.rb
+++ b/lib/msf/base/sessions/meterpreter_x86_linux.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/meterpreter'
 
diff --git a/lib/msf/base/sessions/meterpreter_x86_win.rb b/lib/msf/base/sessions/meterpreter_x86_win.rb
index 2f44f0e640..c3ec8ee2cc 100644
--- a/lib/msf/base/sessions/meterpreter_x86_win.rb
+++ b/lib/msf/base/sessions/meterpreter_x86_win.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/meterpreter'
 require 'msf/windows_error'
diff --git a/lib/msf/base/sessions/tty.rb b/lib/msf/base/sessions/tty.rb
index acaad4629d..400deedc56 100644
--- a/lib/msf/base/sessions/tty.rb
+++ b/lib/msf/base/sessions/tty.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base'
 
diff --git a/lib/msf/base/sessions/vncinject_options.rb b/lib/msf/base/sessions/vncinject_options.rb
index 1ae2954ceb..80d4930abe 100644
--- a/lib/msf/base/sessions/vncinject_options.rb
+++ b/lib/msf/base/sessions/vncinject_options.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 module Sessions
diff --git a/lib/msf/base/simple/buffer.rb b/lib/msf/base/simple/buffer.rb
index 3e2b0aff30..7b31207d63 100644
--- a/lib/msf/base/simple/buffer.rb
+++ b/lib/msf/base/simple/buffer.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base'
 
diff --git a/lib/msf/base/simple/payload.rb b/lib/msf/base/simple/payload.rb
index 59357b1255..7415993b76 100644
--- a/lib/msf/base/simple/payload.rb
+++ b/lib/msf/base/simple/payload.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base'
 
diff --git a/lib/msf/core/auxiliary/commandshell.rb b/lib/msf/core/auxiliary/commandshell.rb
index ae145c81be..72963b59af 100644
--- a/lib/msf/core/auxiliary/commandshell.rb
+++ b/lib/msf/core/auxiliary/commandshell.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/base/sessions/command_shell_options'
 
diff --git a/lib/msf/core/auxiliary/login.rb b/lib/msf/core/auxiliary/login.rb
index 3072a44907..88012bca00 100644
--- a/lib/msf/core/auxiliary/login.rb
+++ b/lib/msf/core/auxiliary/login.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 
diff --git a/lib/msf/core/auxiliary/pii.rb b/lib/msf/core/auxiliary/pii.rb
index 3630f08835..9f50b9d17f 100644
--- a/lib/msf/core/auxiliary/pii.rb
+++ b/lib/msf/core/auxiliary/pii.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-###
-# $Id$
-###
 
 module Msf
 
diff --git a/lib/msf/core/auxiliary/rservices.rb b/lib/msf/core/auxiliary/rservices.rb
index 25671464df..737b3415c6 100644
--- a/lib/msf/core/auxiliary/rservices.rb
+++ b/lib/msf/core/auxiliary/rservices.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 ##
 #
diff --git a/lib/msf/core/encoded_payload.rb b/lib/msf/core/encoded_payload.rb
index 2cdf6a66a1..afccaab26d 100755
--- a/lib/msf/core/encoded_payload.rb
+++ b/lib/msf/core/encoded_payload.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/core'
 
diff --git a/lib/msf/core/exploit/browser_autopwn.rb b/lib/msf/core/exploit/browser_autopwn.rb
index f4b63f8251..1ee518d714 100644
--- a/lib/msf/core/exploit/browser_autopwn.rb
+++ b/lib/msf/core/exploit/browser_autopwn.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 #
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
diff --git a/lib/msf/core/exploit/cmdstager.rb b/lib/msf/core/exploit/cmdstager.rb
index c99d29064f..4cb43ff7e1 100644
--- a/lib/msf/core/exploit/cmdstager.rb
+++ b/lib/msf/core/exploit/cmdstager.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/exploitation/cmdstager'
 require 'msf/core/exploit/exe'
diff --git a/lib/msf/core/exploit/cmdstager_debug_asm.rb b/lib/msf/core/exploit/cmdstager_debug_asm.rb
index 508307a25d..41b9bd43c8 100644
--- a/lib/msf/core/exploit/cmdstager_debug_asm.rb
+++ b/lib/msf/core/exploit/cmdstager_debug_asm.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/core/exploit/cmdstager'
 
diff --git a/lib/msf/core/exploit/cmdstager_debug_write.rb b/lib/msf/core/exploit/cmdstager_debug_write.rb
index 8b73ac8adf..964a5e8d00 100644
--- a/lib/msf/core/exploit/cmdstager_debug_write.rb
+++ b/lib/msf/core/exploit/cmdstager_debug_write.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/core/exploit/cmdstager'
 
diff --git a/lib/msf/core/exploit/cmdstager_tftp.rb b/lib/msf/core/exploit/cmdstager_tftp.rb
index 5549a687bd..aae3b0bf2b 100644
--- a/lib/msf/core/exploit/cmdstager_tftp.rb
+++ b/lib/msf/core/exploit/cmdstager_tftp.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/text'
 require 'msf/core/exploit/tftp'
diff --git a/lib/msf/core/exploit/cmdstager_vbs.rb b/lib/msf/core/exploit/cmdstager_vbs.rb
index 1247d118a7..05ae9acc74 100644
--- a/lib/msf/core/exploit/cmdstager_vbs.rb
+++ b/lib/msf/core/exploit/cmdstager_vbs.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'msf/core/exploit/cmdstager'
 
diff --git a/lib/msf/core/exploit/cmdstager_vbs_adodb.rb b/lib/msf/core/exploit/cmdstager_vbs_adodb.rb
index b6a082a2a1..3a19611a2e 100644
--- a/lib/msf/core/exploit/cmdstager_vbs_adodb.rb
+++ b/lib/msf/core/exploit/cmdstager_vbs_adodb.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id: $
 
 require 'msf/core/exploit/cmdstager'
 
diff --git a/lib/msf/core/exploit/dhcp.rb b/lib/msf/core/exploit/dhcp.rb
index 455c204d84..baac9dec9f 100644
--- a/lib/msf/core/exploit/dhcp.rb
+++ b/lib/msf/core/exploit/dhcp.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/proto/dhcp'
 
diff --git a/lib/msf/core/exploit/egghunter.rb b/lib/msf/core/exploit/egghunter.rb
index 31db349cc1..20fc6f0988 100644
--- a/lib/msf/core/exploit/egghunter.rb
+++ b/lib/msf/core/exploit/egghunter.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/exploitation/egghunter'
 
diff --git a/lib/msf/core/exploit/exe.rb b/lib/msf/core/exploit/exe.rb
index e4d632d0ef..49ee94e3e5 100644
--- a/lib/msf/core/exploit/exe.rb
+++ b/lib/msf/core/exploit/exe.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 ###
 #
diff --git a/lib/msf/core/exploit/fmtstr.rb b/lib/msf/core/exploit/fmtstr.rb
index 7de70ff6e9..39ea610dce 100644
--- a/lib/msf/core/exploit/fmtstr.rb
+++ b/lib/msf/core/exploit/fmtstr.rb
@@ -7,7 +7,6 @@ module Msf
 # in a more intelligent way.
 #
 # Author: jduck
-# $Id$
 ###
 
 module Exploit::FormatString
diff --git a/lib/msf/core/exploit/ipv6.rb b/lib/msf/core/exploit/ipv6.rb
index 7be24e6aec..d6f81faf8d 100644
--- a/lib/msf/core/exploit/ipv6.rb
+++ b/lib/msf/core/exploit/ipv6.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 
diff --git a/lib/msf/core/exploit/mixins.rb b/lib/msf/core/exploit/mixins.rb
index 709457ffa0..431488690d 100644
--- a/lib/msf/core/exploit/mixins.rb
+++ b/lib/msf/core/exploit/mixins.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 #
 # All exploit mixins should be added to the list below
 #
diff --git a/lib/msf/core/exploit/mysql.rb b/lib/msf/core/exploit/mysql.rb
index b86e51e9a9..e8dd2ac0bf 100644
--- a/lib/msf/core/exploit/mysql.rb
+++ b/lib/msf/core/exploit/mysql.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 ##
 # This file is part of the Metasploit Framework and may be subject to
diff --git a/lib/msf/core/exploit/omelet.rb b/lib/msf/core/exploit/omelet.rb
index 41d7905fd4..e5945812a6 100644
--- a/lib/msf/core/exploit/omelet.rb
+++ b/lib/msf/core/exploit/omelet.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/exploitation/omelet'
 
diff --git a/lib/msf/core/exploit/pdf.rb b/lib/msf/core/exploit/pdf.rb
index 630d8dc579..9f3c4777d6 100644
--- a/lib/msf/core/exploit/pdf.rb
+++ b/lib/msf/core/exploit/pdf.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 ###
 #
diff --git a/lib/msf/core/exploit/php_exe.rb b/lib/msf/core/exploit/php_exe.rb
index 3c59f568ed..0a768a436e 100644
--- a/lib/msf/core/exploit/php_exe.rb
+++ b/lib/msf/core/exploit/php_exe.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 ###
 #
diff --git a/lib/msf/core/exploit/riff.rb b/lib/msf/core/exploit/riff.rb
index 3681c0f2bf..57b7b167af 100644
--- a/lib/msf/core/exploit/riff.rb
+++ b/lib/msf/core/exploit/riff.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 
diff --git a/lib/msf/core/exploit/tcp.rb b/lib/msf/core/exploit/tcp.rb
index 5a923427ec..a34f195744 100644
--- a/lib/msf/core/exploit/tcp.rb
+++ b/lib/msf/core/exploit/tcp.rb
@@ -468,6 +468,8 @@ module Exploit::Remote::TcpServer
 	#
 	def regenerate_payload(cli, arch = nil, platform = nil, target = nil)
 
+		$stderr.puts("Tcp##{__method__} : target: #{target.inspect}")
+
 		ohost = datastore['RHOST']
 		oport = datastore['RPORT']
 		p = nil
@@ -477,7 +479,7 @@ module Exploit::Remote::TcpServer
 			datastore['RHOST'] = cli.peerhost
 			datastore['RPORT'] = cli.peerport
 
-			if ((p = super(arch, platform, target)) == nil)
+			if ((p = super(platform, arch, target)) == nil)
 				print_error("Failed to generate payload")
 				return nil
 			end
diff --git a/lib/msf/core/exploit/telnet.rb b/lib/msf/core/exploit/telnet.rb
index 8a7655055f..ba0b65bf24 100644
--- a/lib/msf/core/exploit/telnet.rb
+++ b/lib/msf/core/exploit/telnet.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 
diff --git a/lib/msf/core/exploit/tftp.rb b/lib/msf/core/exploit/tftp.rb
index c20250f5d8..a75ab290f4 100644
--- a/lib/msf/core/exploit/tftp.rb
+++ b/lib/msf/core/exploit/tftp.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/proto/tftp'
 
diff --git a/lib/msf/core/exploit/wbemexec.rb b/lib/msf/core/exploit/wbemexec.rb
index 660d29f45d..a8e8e89d01 100644
--- a/lib/msf/core/exploit/wbemexec.rb
+++ b/lib/msf/core/exploit/wbemexec.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 #
 # This mixin enables executing arbitrary commands via the
diff --git a/lib/msf/core/payload/generic.rb b/lib/msf/core/payload/generic.rb
index c72cf13bf0..4691c7ed59 100644
--- a/lib/msf/core/payload/generic.rb
+++ b/lib/msf/core/payload/generic.rb
@@ -211,10 +211,13 @@ protected
 		arch = nil
 
 		if explicit_arch.nil? == false
+			$stderr.puts "explicit"
 			arch = explicit_arch
 		elsif datastore['ARCH']
+			$stderr.puts "datastore"
 			arch = datastore['ARCH']
 		elsif assoc_exploit
+			$stderr.puts "assoc_exploit"
 			arch = assoc_exploit.target_arch || ARCH_X86
 		end
 
@@ -233,6 +236,8 @@ protected
 
 		# Look for one based on the exploit's compatible set
 		if(assoc_exploit)
+			$stderr.puts "assoc_exploit #{assoc_exploit.name}"
+			$stderr.puts "#{actual_arch} #{actual_platform.inspect}"
 			self.actual_payload = framework.payloads.find_payload_from_set(
 				assoc_exploit.compatible_payloads,
 				actual_platform,
diff --git a/lib/msf/core/payload/windows/exec.rb b/lib/msf/core/payload/windows/exec.rb
index 5ad8a42568..5e3f9b510a 100644
--- a/lib/msf/core/payload/windows/exec.rb
+++ b/lib/msf/core/payload/windows/exec.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 
diff --git a/lib/msf/core/payload/windows/loadlibrary.rb b/lib/msf/core/payload/windows/loadlibrary.rb
index 05854d12df..dc128e3d18 100644
--- a/lib/msf/core/payload/windows/loadlibrary.rb
+++ b/lib/msf/core/payload/windows/loadlibrary.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Msf
 
diff --git a/lib/msf/core/rpc/v10/rpc_module.rb b/lib/msf/core/rpc/v10/rpc_module.rb
index 0a112be7f7..f831730fe1 100644
--- a/lib/msf/core/rpc/v10/rpc_module.rb
+++ b/lib/msf/core/rpc/v10/rpc_module.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id: module.rb 12624 2011-05-15 23:51:53Z hdm $
-##
 
 module Msf
 module RPC
diff --git a/lib/msf/ui/console/command_dispatcher/payload.rb b/lib/msf/ui/console/command_dispatcher/payload.rb
index 8b6a248384..65a41f1650 100644
--- a/lib/msf/ui/console/command_dispatcher/payload.rb
+++ b/lib/msf/ui/console/command_dispatcher/payload.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/parser/arguments'
 
diff --git a/lib/msf/windows_error.rb b/lib/msf/windows_error.rb
index 94053f8e52..42c2d175fa 100644
--- a/lib/msf/windows_error.rb
+++ b/lib/msf/windows_error.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 #
 # Windows system error codes (0-499)
diff --git a/lib/rex/elfparsey.rb b/lib/rex/elfparsey.rb
index a9f891066a..abe5e626ee 100644
--- a/lib/rex/elfparsey.rb
+++ b/lib/rex/elfparsey.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ElfParsey
 
diff --git a/lib/rex/elfparsey/elf.rb b/lib/rex/elfparsey/elf.rb
index 9d9811f6d5..33061fe6e4 100644
--- a/lib/rex/elfparsey/elf.rb
+++ b/lib/rex/elfparsey/elf.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 require 'rex/elfparsey/elfbase'
 require 'rex/elfparsey/exceptions'
 require 'rex/image_source'
diff --git a/lib/rex/elfparsey/elfbase.rb b/lib/rex/elfparsey/elfbase.rb
index be5691e2d8..d91ba7aee1 100644
--- a/lib/rex/elfparsey/elfbase.rb
+++ b/lib/rex/elfparsey/elfbase.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 require 'rex/struct2'
 
 module Rex
diff --git a/lib/rex/elfparsey/exceptions.rb b/lib/rex/elfparsey/exceptions.rb
index 4e3804424f..5437246afe 100644
--- a/lib/rex/elfparsey/exceptions.rb
+++ b/lib/rex/elfparsey/exceptions.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ElfParsey
 
diff --git a/lib/rex/elfscan.rb b/lib/rex/elfscan.rb
index d3e66affbc..38c9706690 100644
--- a/lib/rex/elfscan.rb
+++ b/lib/rex/elfscan.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ElfScan
 
diff --git a/lib/rex/elfscan/scanner.rb b/lib/rex/elfscan/scanner.rb
index 115aa0977d..244ee7e728 100644
--- a/lib/rex/elfscan/scanner.rb
+++ b/lib/rex/elfscan/scanner.rb
@@ -1,7 +1,5 @@
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ElfScan
 module Scanner
diff --git a/lib/rex/elfscan/search.rb b/lib/rex/elfscan/search.rb
index 80f7be017c..cb0e9292f1 100644
--- a/lib/rex/elfscan/search.rb
+++ b/lib/rex/elfscan/search.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ElfScan
 module Search
diff --git a/lib/rex/exploitation/cmdstager/tftp.rb b/lib/rex/exploitation/cmdstager/tftp.rb
index 3607fb4ea7..e646e291f1 100644
--- a/lib/rex/exploitation/cmdstager/tftp.rb
+++ b/lib/rex/exploitation/cmdstager/tftp.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/text'
 require 'rex/arch'
diff --git a/lib/rex/exploitation/jsobfu.rb b/lib/rex/exploitation/jsobfu.rb
index 2c8d51299a..32bc87f640 100644
--- a/lib/rex/exploitation/jsobfu.rb
+++ b/lib/rex/exploitation/jsobfu.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/text'
 require 'rkelly'
diff --git a/lib/rex/image_source.rb b/lib/rex/image_source.rb
index 1cf4a94a8d..f7f3ff1c44 100644
--- a/lib/rex/image_source.rb
+++ b/lib/rex/image_source.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ImageSource
 
diff --git a/lib/rex/image_source/disk.rb b/lib/rex/image_source/disk.rb
index 0b3f5faa83..f37b7be47f 100644
--- a/lib/rex/image_source/disk.rb
+++ b/lib/rex/image_source/disk.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 require 'rex/image_source/image_source'
 require 'rex/struct2'
 
diff --git a/lib/rex/image_source/image_source.rb b/lib/rex/image_source/image_source.rb
index 549388fc4e..4d6e428e06 100644
--- a/lib/rex/image_source/image_source.rb
+++ b/lib/rex/image_source/image_source.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module ImageSource
 class ImageSource
diff --git a/lib/rex/image_source/memory.rb b/lib/rex/image_source/memory.rb
index c75be1881f..3f27990324 100644
--- a/lib/rex/image_source/memory.rb
+++ b/lib/rex/image_source/memory.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 require 'rex/image_source/image_source'
 require 'rex/struct2'
 
diff --git a/lib/rex/ole.rb b/lib/rex/ole.rb
index d2a0407134..38f6f4924a 100644
--- a/lib/rex/ole.rb
+++ b/lib/rex/ole.rb
@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation
diff --git a/lib/rex/ole/clsid.rb b/lib/rex/ole/clsid.rb
index e697dd121d..b6458c903e 100644
--- a/lib/rex/ole/clsid.rb
+++ b/lib/rex/ole/clsid.rb
@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation
diff --git a/lib/rex/ole/difat.rb b/lib/rex/ole/difat.rb
index 52ab121b4c..825a1089b4 100644
--- a/lib/rex/ole/difat.rb
+++ b/lib/rex/ole/difat.rb
@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation
diff --git a/lib/rex/ole/directory.rb b/lib/rex/ole/directory.rb
index 4b91038686..464a073ebd 100644
--- a/lib/rex/ole/directory.rb
+++ b/lib/rex/ole/directory.rb
@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation
diff --git a/lib/rex/ole/direntry.rb b/lib/rex/ole/direntry.rb
index c6f634691a..a546a6e32b 100644
--- a/lib/rex/ole/direntry.rb
+++ b/lib/rex/ole/direntry.rb
@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation
diff --git a/lib/rex/ole/fat.rb b/lib/rex/ole/fat.rb
index 2edb3de8ac..0adc2aa30d 100644
--- a/lib/rex/ole/fat.rb
+++ b/lib/rex/ole/fat.rb
@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation
diff --git a/lib/rex/ole/header.rb b/lib/rex/ole/header.rb
index b24eef4e31..a6341e7636 100644
--- a/lib/rex/ole/header.rb
+++ b/lib/rex/ole/header.rb
@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation
diff --git a/lib/rex/ole/minifat.rb b/lib/rex/ole/minifat.rb
index 1e9bbdb0e3..df2b073582 100644
--- a/lib/rex/ole/minifat.rb
+++ b/lib/rex/ole/minifat.rb
@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation
diff --git a/lib/rex/ole/propset.rb b/lib/rex/ole/propset.rb
index 8a1812d96c..f5c94a602a 100644
--- a/lib/rex/ole/propset.rb
+++ b/lib/rex/ole/propset.rb
@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation
diff --git a/lib/rex/ole/storage.rb b/lib/rex/ole/storage.rb
index 55f6259a60..fc6a15797a 100644
--- a/lib/rex/ole/storage.rb
+++ b/lib/rex/ole/storage.rb
@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation
diff --git a/lib/rex/ole/stream.rb b/lib/rex/ole/stream.rb
index fd7e36d050..8d2ea7f3d5 100644
--- a/lib/rex/ole/stream.rb
+++ b/lib/rex/ole/stream.rb
@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation
diff --git a/lib/rex/ole/substorage.rb b/lib/rex/ole/substorage.rb
index 1e14440853..b60a8714fb 100644
--- a/lib/rex/ole/substorage.rb
+++ b/lib/rex/ole/substorage.rb
@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation
diff --git a/lib/rex/ole/util.rb b/lib/rex/ole/util.rb
index 5712e598c8..90da72d3c9 100644
--- a/lib/rex/ole/util.rb
+++ b/lib/rex/ole/util.rb
@@ -1,8 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-# Version: $Revision$
-##
 
 ##
 # Rex::OLE - an OLE implementation
diff --git a/lib/rex/peparsey.rb b/lib/rex/peparsey.rb
index 6e6addffe7..22916826fd 100644
--- a/lib/rex/peparsey.rb
+++ b/lib/rex/peparsey.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module PeParsey
 
diff --git a/lib/rex/peparsey/exceptions.rb b/lib/rex/peparsey/exceptions.rb
index 45951f8322..359b2807fd 100644
--- a/lib/rex/peparsey/exceptions.rb
+++ b/lib/rex/peparsey/exceptions.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module PeParsey
 
diff --git a/lib/rex/peparsey/pe.rb b/lib/rex/peparsey/pe.rb
index 3966e06f0b..de895159e3 100644
--- a/lib/rex/peparsey/pe.rb
+++ b/lib/rex/peparsey/pe.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 require 'rex/image_source'
 require 'rex/peparsey/exceptions'
 require 'rex/peparsey/pebase'
diff --git a/lib/rex/peparsey/pe_memdump.rb b/lib/rex/peparsey/pe_memdump.rb
index 85f118f8c7..eef2ab7a53 100644
--- a/lib/rex/peparsey/pe_memdump.rb
+++ b/lib/rex/peparsey/pe_memdump.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 require 'rex/image_source'
 require 'rex/peparsey/exceptions'
 require 'rex/peparsey/pebase'
diff --git a/lib/rex/peparsey/pebase.rb b/lib/rex/peparsey/pebase.rb
index bf268e6b36..5a3e5247b9 100644
--- a/lib/rex/peparsey/pebase.rb
+++ b/lib/rex/peparsey/pebase.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 require 'rex/peparsey/exceptions'
 require 'rex/struct2'
 
diff --git a/lib/rex/peparsey/section.rb b/lib/rex/peparsey/section.rb
index 392b42f067..8110cc071e 100644
--- a/lib/rex/peparsey/section.rb
+++ b/lib/rex/peparsey/section.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 require 'rex/peparsey/exceptions'
 require 'rex/peparsey/pebase'
 require 'rex/struct2'
diff --git a/lib/rex/pescan.rb b/lib/rex/pescan.rb
index 163c6f0db5..9483abc15f 100644
--- a/lib/rex/pescan.rb
+++ b/lib/rex/pescan.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id$
-
 module Rex
 module PeScan
 
diff --git a/lib/rex/proto/dhcp.rb b/lib/rex/proto/dhcp.rb
index 9a8a036f84..d28ae0bf8b 100644
--- a/lib/rex/proto/dhcp.rb
+++ b/lib/rex/proto/dhcp.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 #
 # DHCP Server support written by scriptjunkie
 #
diff --git a/lib/rex/proto/dhcp/constants.rb b/lib/rex/proto/dhcp/constants.rb
index c99d74f1bc..96e2829691 100644
--- a/lib/rex/proto/dhcp/constants.rb
+++ b/lib/rex/proto/dhcp/constants.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 require 'rex/proto/dhcp'
 
 module Rex
diff --git a/lib/rex/proto/dhcp/server.rb b/lib/rex/proto/dhcp/server.rb
index abfd39d2d0..1dccbc0c09 100644
--- a/lib/rex/proto/dhcp/server.rb
+++ b/lib/rex/proto/dhcp/server.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 
 require 'rex/socket'
 require 'rex/proto/dhcp'
diff --git a/lib/rex/proto/ntlm/crypt.rb b/lib/rex/proto/ntlm/crypt.rb
index f7a99efcfb..3885f29b85 100644
--- a/lib/rex/proto/ntlm/crypt.rb
+++ b/lib/rex/proto/ntlm/crypt.rb
@@ -43,10 +43,6 @@
 # The latter has a minor bug in its separate_keys function.
 # The third key has to begin from the 14th character of the
 # input string instead of 13th:)
-#--
-# $Id: ntlm.rb 11678 2011-01-30 19:26:35Z hdm $
-#++
-
 
 require 'rex/proto/ntlm/constants'
 require 'rex/proto/ntlm/base'
diff --git a/lib/rex/proto/ntlm/message.rb b/lib/rex/proto/ntlm/message.rb
index a8c678e877..efe5f7ec4d 100644
--- a/lib/rex/proto/ntlm/message.rb
+++ b/lib/rex/proto/ntlm/message.rb
@@ -40,9 +40,6 @@
 # The latter has a minor bug in its separate_keys function.
 # The third key has to begin from the 14th character of the
 # input string instead of 13th:)
-#--
-# $Id: ntlm.rb 11678 2011-01-30 19:26:35Z hdm $
-#++
 
 #this module defines the message class , useful for easily handling type 1/2/3 ntlm messages
 
diff --git a/lib/rex/proto/rfb.rb b/lib/rex/proto/rfb.rb
index 378bc1428b..623f780b29 100644
--- a/lib/rex/proto/rfb.rb
+++ b/lib/rex/proto/rfb.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id: $
 #
 # RFB protocol support
 #
diff --git a/lib/rex/proto/rfb.rb.ut.rb b/lib/rex/proto/rfb.rb.ut.rb
index d06de6c4d2..cb9900de64 100644
--- a/lib/rex/proto/rfb.rb.ut.rb
+++ b/lib/rex/proto/rfb.rb.ut.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
 #
-# $Id: $
-#
 # RFB protocol support
 #
 # @author Joshua J. Drake <jduck>
diff --git a/lib/rex/proto/rfb/cipher.rb b/lib/rex/proto/rfb/cipher.rb
index 7a0c37dbdb..ca54d19a2e 100644
--- a/lib/rex/proto/rfb/cipher.rb
+++ b/lib/rex/proto/rfb/cipher.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id: $
-##
 
 ##
 #
diff --git a/lib/rex/proto/rfb/client.rb b/lib/rex/proto/rfb/client.rb
index 723a067034..fd75160953 100644
--- a/lib/rex/proto/rfb/client.rb
+++ b/lib/rex/proto/rfb/client.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id: $
-##
 
 ##
 #
diff --git a/lib/rex/proto/rfb/constants.rb b/lib/rex/proto/rfb/constants.rb
index fc5517d8a3..868b6533f1 100644
--- a/lib/rex/proto/rfb/constants.rb
+++ b/lib/rex/proto/rfb/constants.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id: $
-##
 
 ##
 #
diff --git a/lib/rex/proto/tftp.rb b/lib/rex/proto/tftp.rb
index 2ed08237e4..22e93f8bf7 100644
--- a/lib/rex/proto/tftp.rb
+++ b/lib/rex/proto/tftp.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 #
 # TFTP Server implementation according to:
 #
diff --git a/lib/rex/proto/tftp/constants.rb b/lib/rex/proto/tftp/constants.rb
index d29894c8bf..476000afe4 100644
--- a/lib/rex/proto/tftp/constants.rb
+++ b/lib/rex/proto/tftp/constants.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 require 'rex/proto/tftp'
 
 module Rex
diff --git a/lib/rex/proto/tftp/server.rb b/lib/rex/proto/tftp/server.rb
index c01d18f9a9..7c9e3bee3a 100644
--- a/lib/rex/proto/tftp/server.rb
+++ b/lib/rex/proto/tftp/server.rb
@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-# $Id$
 require 'rex/socket'
 require 'rex/proto/tftp'
 
diff --git a/lib/rex/proto/tftp/server.rb.ut.rb b/lib/rex/proto/tftp/server.rb.ut.rb
index b767e0c2e4..32a0647518 100755
--- a/lib/rex/proto/tftp/server.rb.ut.rb
+++ b/lib/rex/proto/tftp/server.rb.ut.rb
@@ -1,10 +1,5 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
-#
-# $Revision$
-#
-# $Id$
-#
 
 require 'rex/compat'
 require 'rex/proto/tftp'
diff --git a/lib/rex/zip/archive.rb b/lib/rex/zip/archive.rb
index 0c69769aee..b8b068f75f 100644
--- a/lib/rex/zip/archive.rb
+++ b/lib/rex/zip/archive.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Rex
 module Zip
diff --git a/lib/rex/zip/blocks.rb b/lib/rex/zip/blocks.rb
index 6774e73869..d589b99318 100644
--- a/lib/rex/zip/blocks.rb
+++ b/lib/rex/zip/blocks.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Rex
 module Zip
diff --git a/lib/rex/zip/entry.rb b/lib/rex/zip/entry.rb
index ff41196550..b063b6a72e 100644
--- a/lib/rex/zip/entry.rb
+++ b/lib/rex/zip/entry.rb
@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-##
-# $Id$
-##
 
 module Rex
 module Zip
diff --git a/modules/auxiliary/server/capture/drda.rb b/modules/auxiliary/server/capture/drda.rb
index 2072b8545b..f77fe8c5af 100644
--- a/modules/auxiliary/server/capture/drda.rb
+++ b/modules/auxiliary/server/capture/drda.rb
@@ -1,6 +1,4 @@
-##
-# $Id: drda.rb 14774 2012-02-21 01:42:17Z rapid7 $
-##
+# -*- coding: binary -*-
 
 ##
 # This file is part of the Metasploit Framework and may be subject to
diff --git a/modules/exploits/freebsd/telnet/telnet_encrypt_keyid.rb b/modules/exploits/freebsd/telnet/telnet_encrypt_keyid.rb
index b3c33e892f..f98eed8595 100644
--- a/modules/exploits/freebsd/telnet/telnet_encrypt_keyid.rb
+++ b/modules/exploits/freebsd/telnet/telnet_encrypt_keyid.rb
@@ -1,6 +1,4 @@
-##
-# $Id: $
-##
+# -*- coding: binary -*-
 
 ##
 # This file is part of the Metasploit Framework and may be subject to
diff --git a/modules/exploits/linux/telnet/telnet_encrypt_keyid.rb b/modules/exploits/linux/telnet/telnet_encrypt_keyid.rb
index 11b5d57c76..6900ed129a 100644
--- a/modules/exploits/linux/telnet/telnet_encrypt_keyid.rb
+++ b/modules/exploits/linux/telnet/telnet_encrypt_keyid.rb
@@ -1,6 +1,4 @@
-##
-# $Id: $
-##
+# -*- coding: binary -*-
 
 ##
 # This file is part of the Metasploit Framework and may be subject to
diff --git a/modules/exploits/multi/http/jboss_deploymentfilerepository.rb b/modules/exploits/multi/http/jboss_deploymentfilerepository.rb
index 422b8f8392..ae8b61a428 100644
--- a/modules/exploits/multi/http/jboss_deploymentfilerepository.rb
+++ b/modules/exploits/multi/http/jboss_deploymentfilerepository.rb
@@ -1,6 +1,4 @@
-##
-# $Id: jboss_deploymentfilerepository.rb 15620 2012-07-12 07:33:06Z rapid7 $
-##
+# -*- coding: binary -*-
 
 ##
 # This file is part of the Metasploit Framework and may be subject to
diff --git a/modules/exploits/windows/browser/novelliprint_getdriversettings.rb b/modules/exploits/windows/browser/novelliprint_getdriversettings.rb
index bec17f874b..ea8fcce859 100644
--- a/modules/exploits/windows/browser/novelliprint_getdriversettings.rb
+++ b/modules/exploits/windows/browser/novelliprint_getdriversettings.rb
@@ -1,6 +1,4 @@
-##
-# $Id: novelliprint_getdriversettings.rb$
-##
+# -*- coding: binary -*-
 
 ###
 # This file is part of the Metasploit Framework and may be subject to
diff --git a/modules/exploits/windows/misc/citrix_streamprocess_data_msg.rb b/modules/exploits/windows/misc/citrix_streamprocess_data_msg.rb
index e0715c8038..f91f26f1e1 100644
--- a/modules/exploits/windows/misc/citrix_streamprocess_data_msg.rb
+++ b/modules/exploits/windows/misc/citrix_streamprocess_data_msg.rb
@@ -1,6 +1,4 @@
-##
-# $Id: $
-##
+# -*- coding: binary -*-
 
 ##
 # This file is part of the Metasploit Framework and may be subject to
diff --git a/modules/post/windows/gather/credentials/imvu.rb b/modules/post/windows/gather/credentials/imvu.rb
index 745e30410b..2129a721a6 100644
--- a/modules/post/windows/gather/credentials/imvu.rb
+++ b/modules/post/windows/gather/credentials/imvu.rb
@@ -1,6 +1,4 @@
-##
-# $Id: enum_imvu.rb 14100 2011-10-28 18:00:10Z theLightCosine $
-##
+# -*- coding: binary -*-
 
 ##
 # This file is part of the Metasploit Framework and may be subject to
diff --git a/modules/post/windows/gather/credentials/outlook.rb b/modules/post/windows/gather/credentials/outlook.rb
index f9bf10b3e3..38c25e3895 100644
--- a/modules/post/windows/gather/credentials/outlook.rb
+++ b/modules/post/windows/gather/credentials/outlook.rb
@@ -1,4 +1,4 @@
-# $Id: outlook.rb 14835 2012-03-01 22:15:05Z rapid7 $
+# -*- coding: binary -*-
 
 ##
 # This file is part of the Metasploit Framework and may be subject to
diff --git a/modules/post/windows/recon/resolve_ip.rb b/modules/post/windows/recon/resolve_ip.rb
index f4e761de39..36722018f0 100644
--- a/modules/post/windows/recon/resolve_ip.rb
+++ b/modules/post/windows/recon/resolve_ip.rb
@@ -1,6 +1,4 @@
-##
-# $Id $
-##
+# -*- coding: binary -*-
 
 ##
 # This file is part of the Metasploit Framework and may be subject to

From 1cf485fad13ff735bb44dc5f9c22dc32e592f58e Mon Sep 17 00:00:00 2001
From: sinn3r <wei_chen@rapid7.com>
Date: Wed, 22 May 2013 12:06:36 -0500
Subject: [PATCH 2/3] Restore tcp.rb to its current state

---
 lib/msf/core/exploit/tcp.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/msf/core/exploit/tcp.rb b/lib/msf/core/exploit/tcp.rb
index a34f195744..5a923427ec 100644
--- a/lib/msf/core/exploit/tcp.rb
+++ b/lib/msf/core/exploit/tcp.rb
@@ -468,8 +468,6 @@ module Exploit::Remote::TcpServer
 	#
 	def regenerate_payload(cli, arch = nil, platform = nil, target = nil)
 
-		$stderr.puts("Tcp##{__method__} : target: #{target.inspect}")
-
 		ohost = datastore['RHOST']
 		oport = datastore['RPORT']
 		p = nil
@@ -479,7 +477,7 @@ module Exploit::Remote::TcpServer
 			datastore['RHOST'] = cli.peerhost
 			datastore['RPORT'] = cli.peerport
 
-			if ((p = super(platform, arch, target)) == nil)
+			if ((p = super(arch, platform, target)) == nil)
 				print_error("Failed to generate payload")
 				return nil
 			end

From 8483528ae0273bd8c2c2480d2b37ce1b2251464c Mon Sep 17 00:00:00 2001
From: sinn3r <wei_chen@rapid7.com>
Date: Wed, 22 May 2013 12:11:06 -0500
Subject: [PATCH 3/3] Restore generic.rb to the correct state

---
 lib/msf/core/payload/generic.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/msf/core/payload/generic.rb b/lib/msf/core/payload/generic.rb
index 4691c7ed59..c72cf13bf0 100644
--- a/lib/msf/core/payload/generic.rb
+++ b/lib/msf/core/payload/generic.rb
@@ -211,13 +211,10 @@ protected
 		arch = nil
 
 		if explicit_arch.nil? == false
-			$stderr.puts "explicit"
 			arch = explicit_arch
 		elsif datastore['ARCH']
-			$stderr.puts "datastore"
 			arch = datastore['ARCH']
 		elsif assoc_exploit
-			$stderr.puts "assoc_exploit"
 			arch = assoc_exploit.target_arch || ARCH_X86
 		end
 
@@ -236,8 +233,6 @@ protected
 
 		# Look for one based on the exploit's compatible set
 		if(assoc_exploit)
-			$stderr.puts "assoc_exploit #{assoc_exploit.name}"
-			$stderr.puts "#{actual_arch} #{actual_platform.inspect}"
 			self.actual_payload = framework.payloads.find_payload_from_set(
 				assoc_exploit.compatible_payloads,
 				actual_platform,