infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'enum_ad_perf' into enum_ad_users

bug/bundler_fix
Meatballs 2014-01-07 12:21:39 +00:00
parent f99a5b8b47 3bf728da61
commit e75d87327f
No known key found for this signature in database
GPG Key ID: 5380EAF01F2F8B38
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/msf/core/post/windows/ldap.rb
View File

@ -50,7 +50,7 @@ module LDAP
# @param [Array] Attributes to retrieve
# @return [Hash] Entries found
def query_ldap(session_handle, base, scope, filter, fields)
vprint_status ("Searching LDAP directory.")
vprint_status ("Searching LDAP directory")
search = wldap32.ldap_search_sA(session_handle, base, scope, filter, nil, 0, 4)
vprint_status("search: #{search}")
@ -88,7 +88,7 @@ module LDAP
end
if(pEntries[i] == 0)
print_error("Failed to get entry.")
print_error("Failed to get entry")
wldap32.ldap_msgfree(search['res'])
return
end
@ -231,22 +231,22 @@ module LDAP
vprint_status ("Setting Sizelimit Option")
sl_result = wldap32.ldap_set_option(session_handle, LDAP_OPT_SIZELIMIT, size_limit)
vprint_status ("Binding to LDAP server.")
vprint_status ("Binding to LDAP server")
bind_result = wldap32.ldap_bind_sA(session_handle, nil, nil, LDAP_AUTH_NEGOTIATE)
bind = bind_result['return']
unless bind == Error::SUCCESS
vprint_status("Unbinding from LDAP service.")
vprint_status("Unbinding from LDAP service")
wldap32.ldap_unbind(session_handle)
raise RuntimeError.new("Unable to bind to ldap server: #{bind_result["ErrorMessage"]}")
raise RuntimeError.new("Unable to bind to ldap server: #{bind}")
end
if (block_given?)
begin
yield session_handle
ensure
vprint_status("Unbinding from LDAP service.")
vprint_status("Unbinding from LDAP service")
wldap32.ldap_unbind(session_handle)
end
else

2
modules/post/windows/gather/enum_ad_computers.rb
View File

@ -51,7 +51,7 @@ class Metasploit3 < Msf::Post
register_options([
OptInt.new('MAX_SEARCH', [true, 'Maximum values to retrieve, 0 for all.', 50]),
OptBool.new('STORE_LOOT', [true, 'Store file in loot.', false]),
OptBool.new('STORE_DB', [true, 'Store file in DB (performance hit resolving IPs).', true]),
OptBool.new('STORE_DB', [true, 'Store file in DB (performance hit resolving IPs).', false]),
OptString.new('FIELDS', [true, 'FIELDS to retrieve.', 'dNSHostName,distinguishedName,description,operatingSystem,operatingSystemServicePack']),
OptString.new('FILTER', [true, 'Search filter.', '(&(objectCategory=computer)(operatingSystem=*server*))'])
], self.class)