do not wait for WfsDelay if unable to enum printers

git-svn-id: file:///home/svn/framework3/trunk@10553 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-05 19:03:52 +00:00 · 2010-10-05 19:03:52 +00:00 · d2c5d62606
parent 3276451e3d
commit d2c5d62606
1 changed files with 12 additions and 8 deletions
--- a/modules/exploits/windows/smb/ms10_061_spoolss.rb
+++ b/modules/exploits/windows/smb/ms10_061_spoolss.rb
@ -95,15 +95,19 @@ class Metasploit3 < Msf::Exploit::Remote
 		if (pname = datastore['PNAME'])
 			printers << pname
 		else
-			res = self.simple.client.trans(
-				"\\PIPE\\LANMAN",
-				(
-					[0x00].pack('v') +
-					"WrLeh\x00"   +
-					"B13BWz\x00"  +
-					[0x01, 65406].pack("vv")
+			begin
+				res = self.simple.client.trans(
+					"\\PIPE\\LANMAN",
+					(
+						[0x00].pack('v') +
+						"WrLeh\x00"   +
+						"B13BWz\x00"  +
+						[0x01, 65406].pack("vv")
+					)
 				)
-			)
+			rescue ::Rex::Proto::SMB::Exceptions::ErrorCode => e
+				raise RuntimeError, e.message
+			end

 			printers = []