infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
metasploit-framework/modules/auxiliary/scanner
History
Tod Beardsley 7e539332db Reverting disaster merge to 593363c5f with diff 
There was a disaster of a merge at 6f37cf22eb that is particularly
difficult to untangle (it was a bad merge from a long-running local
branch).

What this commit does is simulate a hard reset, by doing thing:

 git checkout -b reset-hard-ohmu
 git reset --hard 593363c5f9
 git checkout upstream-master
 git checkout -b revert-via-diff
 git diff --no-prefix upstream-master..reset-hard-ohmy > patch
 patch -p0 < patch

Since there was one binary change, also did this:

 git checkout upstream-master data/exploits/CVE-2012-1535/Main.swf

Now we have one commit that puts everything back. It screws up
file-level history a little, but it's at least at a point where we can
move on with our lives. Sorry.
 		2013-07-29 21:47:52 -05:00
..
afp Re-add AFP changes due to mangled merge 2012-07-17 00:42:49 -05:00
backdoor msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
couchdb New module title and description fixes 2013-06-03 14:40:38 -05:00
db2 msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
dcerpc msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
dect msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
discovery arp_sweep is once again working 2013-07-08 17:24:28 -05:00
emc msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
finger msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
ftp Handle connect_login return value properly 2013-06-17 15:48:34 -05:00
h323 msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
http Reverting disaster merge to 593363c5f with diff 2013-07-29 21:47:52 -05:00
imap msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
ip msftidy: remove $Revision$ 2013-01-03 01:01:18 +01:00
ipmi Fix last print_ message format 2013-07-02 11:17:16 -05:00
lotus Merges and resolves CJR's normalize_uri fixes 2013-01-07 11:16:58 -06:00
misc Fix file header comment 2013-03-07 17:53:19 -06:00
mongodb Fixes descriptions on new modules. 2012-03-07 09:17:22 -06:00
motorola msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
msf Fix syntax on @@loaded_msfrpc 2012-11-27 14:10:46 -06:00
mssql msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
mysql Reverting disaster merge to 593363c5f with diff 2013-07-29 21:47:52 -05:00
natpmp Fix file header comment 2013-03-07 17:53:19 -06:00
nessus This variable doesn't have to be in a quote 2012-11-27 11:19:04 -06:00
netbios msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
nexpose I missed this sucker: var in a quote 2012-11-27 11:57:51 -06:00
nfs msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
ntp Reverting disaster merge to 593363c5f with diff 2013-07-29 21:47:52 -05:00
openvas Last touch up 2012-11-23 18:51:51 -06:00
oracle Fix file header comment 2013-03-07 17:53:19 -06:00
pcanywhere msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
pop3 msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
portscan msftidy: remove $Revision$ 2013-01-03 01:05:45 +01:00
postgres It's a filename, so not trying to match any single char 2013-04-09 10:20:52 -05:00
rdp Fix broken ms12-020 vulnerability detection 2013-05-22 00:08:25 -04:00
rogue msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
rservices msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
sap Reverting disaster merge to 593363c5f with diff 2013-07-29 21:47:52 -05:00
scada msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
sip msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
smb changed description back 2013-07-24 11:51:06 -07:00
smtp Various description and title updates 2013-07-01 15:37:37 -05:00
snmp Makign changes recommended in redmine 7945 to fix SNMP enum module failing to catch some fail cases 2013-06-07 13:55:59 -05:00
ssh msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
telephony msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
telnet msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
tftp msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
upnp Fix multi-line output due to bad regex flag 2013-02-06 11:27:58 -06:00
vmware Merges and resolves CJR's normalize_uri fixes 2013-01-07 11:16:58 -06:00
vnc msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
voice msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
vxworks msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00
winrm Check for nil before calling on value 2013-04-18 00:32:37 -04:00
x11 msftidy: remove $Revision$ 2013-01-03 00:58:09 +01:00