jvazquez-r7
3d199fe6db
Merge branch 'mipsle-shell_bind_tcp' of https://github.com/kost/metasploit-framework into kost-mipsle-shell_bind_tcp
2013-02-20 01:00:34 +01:00
Tod Beardsley
3949c851a4
Was, indeed, missing an or pipe
2013-02-19 17:53:48 -06:00
Tod Beardsley
d81f177ab6
Adding Nemski's fix
...
[FixRM #7451 ]
2013-02-19 17:51:51 -06:00
sinn3r
5df2d89e8b
Merge branch 'infrastructure/travis-pcaprub' of github.com:jlee-r7/metasploit-framework into jlee-r7-infrastructure/travis-pcaprub
2013-02-19 15:55:09 -06:00
James Lee
040296f13a
Make travis install libpcap-dev
2013-02-19 15:41:31 -06:00
sinn3r
bc03247386
Merge branch 'sap_url_update' of github.com:ChrisJohnRiley/metasploit-framework into ChrisJohnRiley-sap_url_update
2013-02-19 15:08:26 -06:00
sinn3r
92093cd7d8
There's no HttpClient, so it shouldn't be using normalize_uri
2013-02-19 15:04:18 -06:00
sinn3r
e9f4900beb
Merge branch 'fixgenericcustom' of github.com:rsmudge/metasploit-framework into rsmudge-fixgenericcustom
2013-02-19 14:47:18 -06:00
sinn3r
81f0f12c06
Merge branch 'huntersearchdirection' of github.com:corelanc0d3r/metasploit-framework into corelanc0d3r-huntersearchdirection
2013-02-19 12:37:15 -06:00
sinn3r
37634a9e60
Merge branch 'hp_vsa_exec_9' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-hp_vsa_exec_9
2013-02-19 12:36:39 -06:00
sinn3r
189558b862
Merge branch 'openemr_upload_exec' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-openemr_upload_exec
2013-02-19 12:25:00 -06:00
sinn3r
5108e8ef1c
Correct tab
2013-02-19 11:44:41 -06:00
sinn3r
b2664e04fb
Merge branch 'bigant_server_dupf_upload' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-bigant_server_dupf_upload
2013-02-19 11:42:04 -06:00
sinn3r
9813c815ef
Minor changes
2013-02-19 11:40:06 -06:00
sinn3r
553d7abe43
Merge branch 'bigant_server_sch_dupf_bof' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-bigant_server_sch_dupf_bof
2013-02-19 11:26:47 -06:00
Tod Beardsley
ee707904b0
Merges msfupdate for debian.
...
Tested against:
* Windows 7 (Community Edition installation)
* Ubuntu 12 (CE install)
* svn (vintage, from r10850, 2010-10-30)
* git (a few days old)
* BT5R3 (updated already via apt-get)
In all cases, the msfupdate performed as expected.
2013-02-18 23:05:52 -06:00
jvazquez-r7
9af43bc05c
newline to sap_default.txt
2013-02-18 15:58:29 +01:00
jvazquez-r7
a91bbf5f69
Merge branch 'sap_default_user_additions' of https://github.com/ChrisJohnRiley/metasploit-framework into ChrisJohnRiley-sap_default_user_additions
2013-02-18 15:57:26 +01:00
jvazquez-r7
c8778587f5
rename the xml template for s4u
2013-02-18 15:25:03 +01:00
jvazquez-r7
416a7aeaa3
make msftidy happy for s4u_persistence
2013-02-18 15:23:06 +01:00
jvazquez-r7
be0feecf8f
Merge branch 's4u_persistence' of https://github.com/smilingraccoon/metasploit-framework into smilingraccoon-s4u_persistence
2013-02-18 15:22:37 +01:00
corelanc0d3r
0d4a6c6a04
support for searchforward option in egghunter
2013-02-18 12:45:49 +01:00
corelanc0d3r
c6c42dbf59
Merge branch 'master' of git://github.com/rapid7/metasploit-framework
2013-02-18 10:55:46 +01:00
Thomas McCarthy
25f8a7dcb9
Fix expire tag logic and slight clean up
...
Was a dumbass again and didn't fully understand how Optints worked when left blank at run time. If not 0 the expire tag will be inserted now. Also made it print the xpath if used because I believe it will be of value to the user for trouble shooting.
2013-02-17 22:35:52 -05:00
Raphael Mudge
06ba2ef791
Allow generic/custom payload to generate an exe
...
The datastore value of ARCH has no effect on the array of
architectures the generic/custom payload is compatible with.
This commit forces the payload to update its list of compatible
architectures on generation if the ARCH value is set in the
datastore.
See:
http://dev.metasploit.com/redmine/issues/7755
2013-02-17 20:39:54 -05:00
jvazquez-r7
322fa53d49
fix typo
2013-02-17 20:29:41 +01:00
jvazquez-r7
31a3a374c3
Added module for CVE-2012-6274
2013-02-17 20:25:39 +01:00
jvazquez-r7
1a2a0bc38e
Added module for CVE-2012-6275
2013-02-17 20:21:45 +01:00
Thomas McCarthy
a8d574e4ce
Updated one print_status
2013-02-17 14:08:33 -05:00
jvazquez-r7
ec5c8e3a88
Merge branch 'dlink-dir300-600-execution' of https://github.com/m-1-k-3/metasploit-framework into m-1-k-3-dlink-dir300-600-execution
2013-02-16 19:12:42 +01:00
m-1-k-3
dfbe9ce27c
Merge pull request #2 from jvazquez-r7/dlink_review
...
little cleanup plus msftidy compliant
2013-02-16 09:09:17 -08:00
jvazquez-r7
6b1bb9e1e8
Added module for OSVDB 90222
2013-02-16 13:11:46 +01:00
James Lee
f0f3b65252
Merge branch 'master' of github.com:rapid7/metasploit-framework into rapid7
2013-02-16 00:56:52 -06:00
jvazquez-r7
a19da61177
deleting trailing comma
2013-02-16 00:53:28 +01:00
jvazquez-r7
221ce22f53
make msftidy happy
2013-02-15 19:01:58 +01:00
jvazquez-r7
829cf0f076
name changed to dns_srv_enum
2013-02-15 16:20:55 +01:00
jvazquez-r7
d1ba860409
changing filename for dns_srv
2013-02-15 16:20:33 +01:00
jvazquez-r7
374faf9b02
cleanup for dns_srv
2013-02-15 16:19:48 +01:00
jvazquez-r7
9d4bd763a6
Merge branch 'darkoperator-dnsenum2dnssrv' of https://github.com/darkoperator/metasploit-framework into darkoperator-darkoperator-dnsenum2dnssrv
2013-02-15 16:19:31 +01:00
Chris John Riley
6519444112
Addition defaults
2013-02-15 13:35:25 +01:00
Chris John Riley
5df03f790b
Remove end of line spaces and rerun uniq
2013-02-15 13:31:35 +01:00
Chris John Riley
fb7d0159c3
Further URLs
2013-02-15 13:26:44 +01:00
Chris John Riley
21366dd4df
Updated SAP URL list to include further known URLs
2013-02-15 13:20:23 +01:00
jvazquez-r7
38f5fbced3
cleanup for dns_reverse_lookup
2013-02-15 12:56:01 +01:00
jvazquez-r7
f1e3dab45f
Merge branch 'darkoperator-dnsenum2dnsreverselookup' of https://github.com/darkoperator/metasploit-framework into darkoperator-darkoperator-dnsenum2dnsreverselookup
2013-02-15 12:55:39 +01:00
jvazquez-r7
6aed858f80
cleanup for dns_bruteforce
2013-02-15 12:37:46 +01:00
jvazquez-r7
1be003a4d0
Merge branch 'darkoperator-dnsenum2dnsbruteforce' of https://github.com/darkoperator/metasploit-framework into darkoperator-darkoperator-dnsenum2dnsbruteforce
2013-02-15 12:37:27 +01:00
jvazquez-r7
57e1d1baa5
cleanup for dns_info
2013-02-15 12:03:08 +01:00
jvazquez-r7
8a1874b4d1
Merge branch 'darkoperator-dnsenum2dnsinfo' of https://github.com/darkoperator/metasploit-framework into darkoperator-darkoperator-dnsenum2dnsinfo
2013-02-15 12:02:48 +01:00
Carlos Perez
bcd59aa8fa
Typo word module does not go in the name.
2013-02-14 21:56:24 -04:00