From 15990efd8529b245d726b30ddbdbca48d821e448 Mon Sep 17 00:00:00 2001 From: Tod Beardsley Date: Mon, 9 Jan 2012 14:09:27 -0600 Subject: [PATCH] Removing useless (?) begin/rescue from smtp_version Let the scanner mixin handle the exceptions. --- modules/auxiliary/scanner/smtp/smtp_version.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/auxiliary/scanner/smtp/smtp_version.rb b/modules/auxiliary/scanner/smtp/smtp_version.rb index d2d58fe6ea..613ecfc26a 100644 --- a/modules/auxiliary/scanner/smtp/smtp_version.rb +++ b/modules/auxiliary/scanner/smtp/smtp_version.rb @@ -33,15 +33,11 @@ class Metasploit3 < Msf::Auxiliary end def run_host(ip) - begin res = connect banner_sanitized = Rex::Text.to_hex_ascii(banner.to_s) print_status("#{ip}:#{rport} SMTP #{banner_sanitized}") report_service(:host => rhost, :port => rport, :name => "smtp", :info => banner) - rescue ::Rex::ConnectionError - rescue ::Exception => e print_error("#{rhost}:#{rport} #{e} #{e.backtrace}") - end end end