Repull
Merge branch 'master' into wds_scanner_repull
Address egypt's feedback
metasploit module for CVE-2013-3319 / SAP Security Note 1816536

Note: only tested on SAP running on Windows, but should equally work on vulnerable linux/*nix versions.
msftidy - fixed indents
hopefully actually fixed indents.
Included @jvazquez-r7 suggested changes
Included @jvazquez-r7 feedback
fixed typo on a message
Merge for retab
Retab changes for PR #1420
Merge pull request #25 from tabassassin/retab/pr/1420

Retab/pr/1420
Get rid of callcc

[SeeRM 8407]
Update ms12_020_maxchannelids.rb

ms12_020_maxchannelids.rb produces a call stack when the connection is timed out. 

To reproduct, just run the module against a system having no RDP enabled.
Add support for stdapi_net_resolve_host.
Meterpreter railgun multi call fix

Modifications accommodate changes in the multi-call railgun code that
were made to Meterpreter.

This also includes a fix for Redmine 8269, so the Windows constants
now work correctly with the multi-calls.
Add fault tolerance for resolve_hosts.
fix for bug 8456

On systems without bundled johntheripper (either by removing the bundled version or by no compatible version shipped) the system john is used.  In this case, all of the checking for compatible bundled jtr makes no sense and as such we can shortcut out of this to not only reduce the size of msf (for embedded) but also to speed execution (saving multiple calls to some random bundled binary cpuinfo*.bin).

This patch makes it very easy to simply remove cpuinfo and msf will not try to run it when missing and default to running john from the path.
Fix ropdb spec according to @limhoff-r7's comments
Use RopDb msvcrt ROP chain. Tested all targets.
Use a named subject