infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug/MSP-10724/fix-import-failure' into staging/electro-release MSP-10724 #land

bug/bundler_fix
Kyle Gray 2014-07-17 13:37:13 -05:00
parent fd2a12da43 e789d5350b
commit 08cd2690f9
No known key found for this signature in database
GPG Key ID: 5F604D93CA5FEE1A
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/msf/core/db.rb
View File

@ -1372,8 +1372,6 @@ class DBManager
=end =end
ntype = opts.delete(:type) || opts.delete(:ntype) || (raise RuntimeError, "A note :type or :ntype is required") ntype = opts.delete(:type) || opts.delete(:ntype) || (raise RuntimeError, "A note :type or :ntype is required")
data = opts[:data] data = opts[:data]
method = nil
args = []
note = nil note = nil
conditions = { :ntype => ntype } conditions = { :ntype => ntype }
@ -1382,15 +1380,7 @@ class DBManager
case mode case mode
when :unique when :unique
notes = wspace.notes.where(conditions) note = wspace.notes.where(conditions).first_or_initialize
# Only one note of this type should exist, make a new one if it
# isn't there. If it is, grab it and overwrite its data.
if notes.empty?
note = wspace.notes.new(conditions)
else
note = notes[0]
end
note.data = data note.data = data
when :unique_data when :unique_data
notes = wspace.notes.where(conditions) notes = wspace.notes.where(conditions)