Fix direct datastore assignments to pass msftidy

bug/bundler_fix
sinn3r 2014-08-07 17:51:45 -05:00
parent 2967d85e44
commit 6f8c7f092a
1 changed files with 11 additions and 3 deletions

View File

@ -33,6 +33,14 @@ class Metasploit3 < Msf::Auxiliary
deregister_options('RPORT', 'RHOST') deregister_options('RPORT', 'RHOST')
end end
def rport
@rport || datastore['RPORT']
end
def smbdirect
@smbdirect || datastore['SMBDirect']
end
# Locate an available SMB PIPE for the specified service # Locate an available SMB PIPE for the specified service
def smb_find_dcerpc_pipe(uuid, vers, pipes) def smb_find_dcerpc_pipe(uuid, vers, pipes)
found_pipe = nil found_pipe = nil
@ -132,8 +140,8 @@ class Metasploit3 < Msf::Auxiliary
[[139, false], [445, true]].each do |info| [[139, false], [445, true]].each do |info|
datastore['RPORT'] = info[0] @rport = info[0]
datastore['SMBDirect'] = info[1] @smbdirect = info[1]
sam_pipe = nil sam_pipe = nil
sam_handle = nil sam_handle = nil
@ -291,7 +299,7 @@ class Metasploit3 < Msf::Auxiliary
report_note( report_note(
:host => ip, :host => ip,
:proto => 'tcp', :proto => 'tcp',
:port => datastore['RPORT'], :port => rport,
:type => 'smb.domain.enumusers', :type => 'smb.domain.enumusers',
:data => domains[domain] :data => domains[domain]
) )