See #726. Cleaning up my gross whitespace.

git-svn-id: file:///home/svn/framework3/trunk@8311 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
Tod Beardsley 2010-01-28 23:08:39 +00:00
parent 9c1ceb1b8a
commit a76480d42c
3 changed files with 10 additions and 10 deletions

View File

@ -52,8 +52,8 @@ module Exploit::Remote::DB2
probe_data = db2_probe
return probe_data unless probe_data[:plaintext_auth]
login_packet = Rex::Proto::DRDA::Utils.client_auth(:dbname => datastore['DATABASE'],
:dbuser => datastore['USERNAME'],
:dbpass => datastore['PASSWORD'])
:dbuser => datastore['USERNAME'],
:dbpass => datastore['PASSWORD'])
sock.put login_packet
resp = sock.get_once
return {} if not resp

View File

@ -25,7 +25,7 @@ end
# Currently, only takes a MGRLVLLS param. Extend the struct
# when more parameters are defined.
class EXCSAT_DDM < Struct.new(:length, :magic, :format, :correlid, :length2,
:codepoint, :mgrlvlls)
:codepoint, :mgrlvlls)
def initialize(args={})
self[:magic] = 0xd0
@ -84,7 +84,7 @@ end
# also sets the relational database name (RDBNAM), if specified. You need
# one to login, but not to probe.
class ACCSEC_DDM < Struct.new(:length, :magic, :format, :correlid, :length2,
:codepoint, :secmec, :rdbnam)
:codepoint, :secmec, :rdbnam)
def initialize(args={})
self[:magic] = 0xd0
self[:format] = args[:format] || 0x01
@ -127,7 +127,7 @@ class DDM_PARAM < Struct.new(:length, :codepoint, :payload)
end
class BASIC_DDM < Struct.new(:length, :magic, :format, :correlid,
:length2, :codepoint, :payload)
:length2, :codepoint, :payload)
def initialize
self[:payload] = []
end
@ -219,7 +219,7 @@ class USERID_PARAM < Struct.new(:length, :codepoint, :payload)
end
class SECCHK_DDM < Struct.new(:length, :magic, :format, :correlid, :length2,
:codepoint, :secmec, :rdbnam, :password, :userid)
:codepoint, :secmec, :rdbnam, :password, :userid)
def initialize(args={}) # Takes :dbname, :dbpass, :dbuser
self[:magic] = 0xd0
self[:format] = 0x01

View File

@ -14,7 +14,7 @@ require 'msf/core'
class Metasploit3 < Msf::Auxiliary
include Msf::Exploit::Remote::DB2
include Msf::Auxiliary::Scanner
include Msf::Auxiliary::Report
@ -46,9 +46,9 @@ class Metasploit3 < Msf::Auxiliary
report_info = "#{plat} : #{ver} : #{inst} : PlainAuth-#{pta ? "OK" : "NO"}"
print_status("#{ip}:#{rport} [DB2] #{report_info}")
report_service(:host => rhost,
:port => rport,
:name => "db2",
:info => report_info)
:port => rport,
:name => "db2",
:info => report_info)
end
disconnect