Commit Graph

14827 Commits (716f4ab3d2e1ac1c8b6a68dd7824e286d9e0a9e5)

Author SHA1 Message Date
sinn3r 716f4ab3d2 Merge branch 'post_clone_proxy' of git://github.com/mubix/metasploit-framework into mubix-post_clone_proxy 2012-10-22 00:41:36 -05:00
sinn3r d22010e3ba Merge branch 'lincoln-corelan-turboftp_exploit' 2012-10-21 16:40:06 -05:00
sinn3r ad9946689e Update description 2012-10-21 16:40:01 -05:00
sinn3r 1821c11369 Code cleanup 2012-10-21 16:40:01 -05:00
sinn3r c404b72d08 Doesn't make a lot of sense setting DefaultTarget to an older one 2012-10-21 16:40:01 -05:00
lincoln@corelan.be c7d12d94b7 turboftp exploit 2012-10-21 16:40:00 -05:00
sinn3r 4e40317faa Update description 2012-10-21 16:38:24 -05:00
sinn3r 72d70b6bc2 Code cleanup 2012-10-21 16:27:24 -05:00
sinn3r 6bccfcd376 Doesn't make a lot of sense setting DefaultTarget to an older one 2012-10-21 16:23:14 -05:00
sinn3r 3f81c06d82 Merge branch 'turboftp_exploit' of git://github.com/lincoln-corelan/metasploit-framework into lincoln-corelan-turboftp_exploit 2012-10-21 16:19:44 -05:00
Rob Fuller 5f99f27899 add proxy setting cloning module 2012-10-21 03:13:35 -04:00
HD Moore 2436ac3a58 Revert "Merge branch 'migrator' of git://github.com/scriptjunkie/metasploit-framework into scriptjunkie-migrator"
This reverts commit ca07bdbad6, reversing
changes made to ed3f87b738.
2012-10-20 22:38:31 -05:00
HD Moore 04e1856a4f Fix a copypasta error triggered by a failed load 2012-10-20 15:00:11 -05:00
sinn3r ae690f5fd3 Remove that extra "," that breaks Ruby 1.8 2012-10-20 02:11:49 -05:00
sinn3r ca07bdbad6 Merge branch 'migrator' of git://github.com/scriptjunkie/metasploit-framework into scriptjunkie-migrator 2012-10-19 15:25:45 -05:00
scriptjunkie 3d08c0c12d Merge pull request #2 from todb-r7/sj-prepend-migrate
Adding prepend_migrate? from todb
2012-10-19 12:55:51 -07:00
Tod Beardsley b7652b44d5 Adding prepend_migrate? 2012-10-19 14:24:13 -05:00
James Lee ed3f87b738 Merge branch 'wchen-r7-print_warning' into rapid7
[Closes #899]
2012-10-19 13:51:57 -05:00
James Lee ffa4373242 Merge branch 'rapid7' into wchen-r7-print_warning
[Closes #899]
2012-10-19 13:49:32 -05:00
lincoln@corelan.be b80b91f6b9 turboftp exploit 2012-10-19 11:05:44 -07:00
Tod Beardsley de26743a31 Merge pull request #931 from jvazquez-r7/apache_activemq_traversal_osvdb
OSVDB reference added
2012-10-19 08:16:01 -07:00
jvazquez-r7 4ad6fcc30e osvdb added 2012-10-19 17:04:47 +02:00
jvazquez-r7 205dc8870a Merge branch 'prependsetguid' of https://github.com/mephos/metasploit-framework into mephos-prependsetguid 2012-10-19 10:33:56 +02:00
sinn3r f3bf69a162 Todb says spaces 2012-10-18 13:42:19 -05:00
sinn3r d7e702891d Merge branch 'cleanup/specs' of git://github.com/jlee-r7/metasploit-framework into jlee-r7-cleanup/specs 2012-10-18 13:19:44 -05:00
James Lee 5f1ec459ee Disambiguate with parens
Removes a "ruby -c -W" warning
2012-10-18 12:46:08 -05:00
James Lee 37522a4bf0 Remove debugging output 2012-10-18 11:47:21 -05:00
James Lee 258c8800fc Add a spec for Util::EXE.to_executable_fmt 2012-10-18 11:40:44 -05:00
jvazquez-r7 291ad27a69 Merge branch 'msftidy_police' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-msftidy_police 2012-10-18 11:32:55 +02:00
sinn3r dbbf1eceaf Merge branch 'find_next_fix' of git://github.com/Meatballs1/metasploit-framework into Meatballs1-find_next_fix 2012-10-17 22:43:09 -05:00
sinn3r 0675a6171b Cosmetic changes 2012-10-17 17:30:16 -05:00
sinn3r 201518b66f msftidy corrections 2012-10-17 17:22:26 -05:00
Meatballs e1a4ec2fcc Fix to SMB Client when using find_first on a directory with exactly 20 files. 2012-10-17 21:58:20 +01:00
jvazquez-r7 7b1c35624e Merge branch 'mssql_ntlm_stealer' of https://github.com/nullbind/metasploit-framework into nullbind-mssql_ntlm_stealer 2012-10-17 22:50:54 +02:00
Scott Sutherland b14a980462 Merge pull request #1 from jvazquez-r7/nullbind_test1
Looks good and works as excepted. Thanks for the updates!
- jvazquez-r7 did some nice clean up
2012-10-17 13:45:11 -07:00
jvazquez-r7 1f55e02535 minor cleanup 2012-10-17 22:21:28 +02:00
jvazquez-r7 4c6b331bdc Merge branch 'mssql_ntlm_stealer_sqli' of https://github.com/nullbind/metasploit-framework into nullbind-mssql_ntlm_stealer_sqli 2012-10-17 22:21:00 +02:00
jvazquez-r7 3bd84e255f minor cleanup 2012-10-17 22:06:47 +02:00
jvazquez-r7 848f0cd899 Merge branch 'module-lantronix_telnet_password' of https://github.com/jgor/metasploit-framework into jgor-module-lantronix_telnet_password 2012-10-17 22:06:25 +02:00
James Lee 4800d5428d Fix nmap spec 2012-10-17 15:01:01 -05:00
James Lee 9e85e97dae Use the proper filename for nmap spec 2012-10-17 15:00:42 -05:00
James Lee e6ec7281f6 Make old specs work with new rake task 2012-10-17 14:50:25 -05:00
James Lee b342cdd52b Move specs from test/tests/ into spec/ 2012-10-17 14:48:53 -05:00
jgor e22059da9d Merge branch 'module-lantronix_telnet_password' of github.com:jgor/metasploit-framework into module-lantronix_telnet_password 2012-10-17 14:27:49 -05:00
jgor 9af727388f deleted superfluous code and comments 2012-10-17 14:27:00 -05:00
jgor c9a5a2b0c6 deleted superflous code and comments 2012-10-17 14:23:00 -05:00
sinn3r feb4389d52 Merge branch 'bug/rm7298-msfvenom-c' of git://github.com/jlee-r7/metasploit-framework into jlee-r7-bug/rm7298-msfvenom-c 2012-10-17 12:18:29 -05:00
jvazquez-r7 12e2ff9bb5 proposed cleanup 2012-10-17 19:03:28 +02:00
James Lee 87eabaf915 Allow 'x64' and 'x86_64' for backcompat 2012-10-17 11:03:42 -05:00
sinn3r e30b5b417a Merge branch 'master' of git://github.com/sput-nick/metasploit-framework into sput-nick-master 2012-10-17 10:35:11 -05:00