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

Change to wldap to allow cdecl

unstable
Meatballs 2013-02-08 21:01:22 +00:00
parent a9bf09aa06
commit a6fea39583
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_wldap32.rb
View File

@ -16,14 +16,14 @@ class Def_wldap32
['PCHAR', 'HostName', 'in'],
['DWORD', 'PortNumber', 'in'],
['DWORD', 'secure', 'in']
])
], 'ldap_sslinitA', "cdecl")
dll.add_function('ldap_bind_sA', 'DWORD',[
['DWORD', 'ld', 'in'],
['PCHAR', 'dn', 'in'],
['PCHAR', 'cred', 'in'],
['DWORD', 'method', 'in']
])
], 'ldap_sslinitA', "cdecl")
dll.add_function('ldap_search_sA', 'DWORD',[
['DWORD', 'ld', 'in'],
@ -33,7 +33,7 @@ class Def_wldap32
['PCHAR', 'attrs[]', 'in'],
['DWORD', 'attrsonly', 'in'],
['PDWORD', 'res', 'out']
])
], 'ldap_sslinitA', "cdecl")
dll.add_function('ldap_count_entries', 'DWORD',[
['DWORD', 'ld', 'in'],
@ -42,61 +42,61 @@ class Def_wldap32
dll.add_function('ldap_first_entry', 'DWORD',[
['DWORD', 'ld', 'in'],
['DWORD', 'res', 'in']
])
], 'ldap_sslinitA', "cdecl")
dll.add_function('ldap_next_entry', 'DWORD',[
['DWORD', 'ld', 'in'],
['DWORD', 'entry', 'in']
])
], 'ldap_sslinitA', "cdecl")
dll.add_function('ldap_first_attributeA', 'DWORD',[
['DWORD', 'ld', 'in'],
['DWORD', 'entry', 'in'],
['DWORD', 'ptr', 'in']
])
], 'ldap_sslinitA', "cdecl")
dll.add_function('ldap_next_attributeA', 'DWORD',[
['DWORD', 'ld', 'in'],
['DWORD', 'entry', 'in'],
['DWORD', 'ptr', 'inout']
])
], 'ldap_sslinitA', "cdecl")
dll.add_function('ldap_count_values', 'DWORD',[
['DWORD', 'vals', 'in'],
])
], 'ldap_sslinitA', "cdecl")
dll.add_function('ldap_get_values', 'DWORD',[
['DWORD', 'ld', 'in'],
['DWORD', 'entry', 'in'],
['PCHAR', 'attr', 'in']
])
], 'ldap_sslinitA', "cdecl")
dll.add_function('ldap_value_free', 'DWORD',[
['DWORD', 'vals', 'in'],
])
], 'ldap_sslinitA', "cdecl")
dll.add_function('ldap_memfree', 'VOID',[
['DWORD', 'block', 'in'],
])
], 'ldap_sslinitA', "cdecl")
dll.add_function('ber_free', 'VOID',[
['DWORD', 'pBerElement', 'in'],
['DWORD', 'fbuf', 'in'],
])
], 'ldap_sslinitA', "cdecl")
dll.add_function('LdapGetLastError', 'DWORD',[])
dll.add_function('LdapGetLastError', 'DWORD',[], 'ldap_sslinitA', "cdecl")
dll.add_function('ldap_err2string', 'DWORD',[
['DWORD', 'err', 'in']
])
], 'ldap_sslinitA', "cdecl")
dll.add_function('ldap_msgfree', 'DWORD', [
['DWORD', 'res', 'in']
])
], 'ldap_sslinitA', "cdecl")
dll.add_function('ldap_unbind', 'DWORD', [
['DWORD', 'ld', 'in']
])
], 'ldap_sslinitA', "cdecl")
return dll
end

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

@ -51,11 +51,6 @@ class Metasploit3 < Msf::Post
end
def run
unless session.platform == "x64/win64"
print_error("Does not work in x86 meterpreter (use x64 instead) see: http://dev.metasploit.com/redmine/issues/7639");
return
end
print_status("Connecting to default LDAP server")
session_handle = bind_default_ldap_server