Skip to content
This repository has been archived by the owner on Jan 22, 2024. It is now read-only.

Post vs2013 39 42 43 #48

Merged
merged 8 commits into from
Nov 6, 2013
Merged

Conversation

todb-r7
Copy link

@todb-r7 todb-r7 commented Nov 6, 2013

This pull request is much like #46, in that it includes the following PRs from @OJ:

It avoids the following:

So right now, #34 is a pretty major blocker, but does not hold up #39, #42, and #43.

These PRs are all already demoed and tested; the purpose of this PR-of-PRs is just to avoid needless extra builds and testing. I'm landing it pretty much immediately.

OJ and others added 8 commits October 28, 2013 15:42
Checking version info now has support for the later versions of windows
based on the documentation available from MSDN.
Pulled the latest version of the incognito code from:
http://labs.mwrinfosecurity.com/blog/2012/07/18/incognito-v2-0-released/

This included a fix for Windows 2003 x64, which was reported as a bug in
RM 8281.
This allows for system proxy setting to be pulled out. Windows-only at
this point.
Closes rapid7#46. Now that these PRs are landed, no need to keep rapid7#46 open.
Discussion should continue on rapid7#34 and possibly rapid7#38.
todb-r7 pushed a commit that referenced this pull request Nov 6, 2013
This lands #39, #42, and #43. #34 still needs work.
@todb-r7 todb-r7 merged commit c40bc6d into rapid7:master Nov 6, 2013
@metasploit-public-bot
Copy link

Test PASSED.
Refer to this link for build results: https://ci.metasploit.com/job/GPR-MeterpreterWin/15/

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants