Replaced if @verbose with vprint_status

Corrected bug in non-detected print types
bug/bundler_fix
Chris John Riley 2012-09-21 10:59:39 +02:00
parent 3d254b69fd
commit 78f77a3df2
1 changed files with 3 additions and 6 deletions

View File

@ -88,7 +88,6 @@ class Metasploit3 < Msf::Auxiliary
raise ArgumentError, "#{name}: Cannot intercept LPR/IPP without a forwarding target" raise ArgumentError, "#{name}: Cannot intercept LPR/IPP without a forwarding target"
end end
@metadata = datastore['METADATA'] @metadata = datastore['METADATA']
@verbose = datastore['VERBOSE']
exploit() exploit()
@ -176,7 +175,7 @@ class Metasploit3 < Msf::Auxiliary
if not @state[c][:prn_type] if not @state[c][:prn_type]
print_error("#{name}: Unable to detect printjob type, dumping complete output") print_error("#{name}: Unable to detect printjob type, dumping complete output")
@state[c][:prn_type] = "Unknown Type" @state[c][:prn_type] = "Unknown Type"
@state[c][:prn_type] = @state[c][:data] @state[c][:raw_data] = @state[c][:data]
end end
# output discovered Metadata if set # output discovered Metadata if set
@ -262,10 +261,8 @@ class Metasploit3 < Msf::Auxiliary
end end
def stream_data(data_to_send) def stream_data(data_to_send)
if @verbose vprint_status("#{name}: Streaming %d bytes of data to #{@rhost}:#{@rport}" \
print_status("#{name}: Streaming %d bytes of data to #{@rhost}:#{@rport}" \ % data_to_send.length)
% data_to_send.length)
end
connect if not sock connect if not sock
sock.put(data_to_send) sock.put(data_to_send)
response = sock.get_once response = sock.get_once