Making telnet timeouts much less disasterous, since they can happen pretty commonly.
git-svn-id: file:///home/svn/framework3/trunk@8769 4d416f70-5f16-0410-b530-b9f4589650daunstable
parent
91404f9c8f
commit
efbdaba298
|
@ -97,6 +97,8 @@ class Metasploit3 < Msf::Auxiliary
|
|||
if ret == :no_pass_prompt
|
||||
print_status "#{rhost}:#{rport} Telnet - Skipping '#{user}':'#{pass}' due to missing password prompt" if datastore['VERBOSE']
|
||||
self.no_pass_prompt << this_cred
|
||||
elsif ret == :timeout
|
||||
print_status "#{rhost}:#{rport} Telnet - Skipping '#{user}':'#{pass}' due to timeout" if datastore['VERBOSE']
|
||||
else
|
||||
start_telnet_session(rhost,rport,user,pass) if login_succeeded?
|
||||
end
|
||||
|
@ -170,8 +172,12 @@ class Metasploit3 < Msf::Auxiliary
|
|||
rescue ::Interrupt
|
||||
raise $!
|
||||
rescue ::Exception => e
|
||||
if e.to_s == "execution expired"
|
||||
return :timeout
|
||||
else
|
||||
print_error("#{rhost}:#{rport} Error: #{e.class} #{e} #{e.backtrace}")
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue