Compare commits

...

21 Commits

Author SHA1 Message Date
Jonathan Cran cdbdd476c9 Merge branch 'release/2012030701' into stable 2012-03-12 17:14:32 -05:00
Jonathan Cran fee0c04b0e updated to reflect update 2012022901 2012-03-05 16:43:28 -06:00
Jenkins ad0251e256 Merge branch 'release/20120213000001' into stable
Conflicts:
	modules/auxiliary/scanner/vmware/vmware_http_login.rb
2012-02-16 12:01:50 -06:00
Jenkins d70596ab44 Merge branch 'release/20120131000001' into stable 2012-02-13 16:27:27 -06:00
Tod Beardsley 77a9b36901 MSFTidy commits
Whitespace fixes, grammar fixes, and breaking up a multiline SOAP
request.

Squashed commit of the following:

commit 2dfd2472f7afc1a05d3647c7ace0d031797c03d9
Author: Tod Beardsley <todb@metasploit.com>
Date:   Wed Feb 1 10:58:53 2012 -0600

    Break up the multiline SOAP thing

commit 747e62c5be2e6ba99f70c03ecd436fc444fda99e
Author: Tod Beardsley <todb@metasploit.com>
Date:   Wed Feb 1 10:48:16 2012 -0600

    More whitespace and indent

commit 12c42aa1efdbf633773096418172e60277162e22
Author: Tod Beardsley <todb@metasploit.com>
Date:   Wed Feb 1 10:39:36 2012 -0600

    Whitespace fixes

commit 32d57444132fef3306ba2bc42743bfa063e498df
Author: Tod Beardsley <todb@metasploit.com>
Date:   Wed Feb 1 10:35:37 2012 -0600

    Grammar fixes for new modules.
2012-02-01 11:05:17 -06:00
Jenkins 060115edf4 Merge branch 'stable' of framework.github.com:rapid7/metasploit-framework into stable 2012-01-31 11:35:21 -06:00
Matt Buck 057a22569b Merge branch 'release/20120124000001' into stable 2012-01-30 17:48:03 -06:00
Jenkins f5e520cc53 Merge branch 'release/20120124000001' into stable 2012-01-30 16:17:21 -06:00
Jonathan Cran 7f9cd45dca Merge branch 'release/20120110000001' into stable 2012-01-17 11:28:06 -06:00
Jonathan Cran 5700bf9db4 Merge branch 'release/20120110000001' of framework.github.com:rapid7/metasploit-framework into release/20120110000001 2012-01-13 13:48:37 -06:00
Tod Beardsley b3925c4465 Drop a spurious print_error line from smtp_version 2012-01-13 13:47:58 -06:00
Tod Beardsley f40df69100 Removing telnet_encrypt_keyid_bruteforce.rb to unstable
can't ship for a few problems, will be fixed up soonish but
about to release a build.
2012-01-11 14:06:34 -06:00
Tod Beardsley dd42f241f7 Death to unicode
Apologies to the authors whose names I am now intentionally misspelling.
Maybe in another 10 years, we can guarantee that all terminals and
machine parsers are okay with unicode suddenly popping up in strings.

Also adds a check in msftidy for stray unicode.
2012-01-11 14:00:26 -06:00
Jonathan Cran 15065ba627 fixup title 2012-01-11 11:15:15 -06:00
Jonathan Cran 9a37792328 Merge branch 'release/2012011000000' into stable 2012-01-10 09:49:11 -06:00
Jonathan Cran f52445930e Merge branch 'release/20120103000001' into stable 2012-01-09 10:12:56 -06:00
Jonathan Cran fdea0ad9c7 Merge branch 'release/20111227000001' into stable 2012-01-03 11:56:42 -06:00
Jonathan Cran 14270fe49f Merge branch 'release/20111219000001' into stable 2011-12-27 11:28:41 -06:00
Jonathan Cran 4259168703 Merge branch 'stable' of r7.github.com:rapid7/metasploit-framework into stable 2011-12-16 22:02:28 -06:00
Jenkins 5249e74ca7 Merge branch 'release/20111213184834' into stable 2011-12-13 19:39:52 -06:00
Jenkins cf0cbff302 Merge branch 'release/20111205000001' into stable 2011-12-13 18:26:13 -06:00
@@ -42,7 +42,6 @@ class Metasploit3 < Msf::Auxiliary
], self.class)
end
def run_host(ip)
return unless check
each_user_pass { |user, pass|
@@ -65,7 +64,6 @@ class Metasploit3 < Msf::Auxiliary
}
end
# Mostly taken from the Apache Tomcat service validator
def check
soap_data =
@@ -128,7 +126,5 @@ class Metasploit3 < Msf::Auxiliary
end
end
end