Merge branch 'nstarke-bugfixes/post-module-execution-causing-duplicate-search-results'

scriptjunkie · scriptjunkie · commit 121ab76d0995 · 2014-06-15T14:14:50.000-05:00
diff --git a/lib/msf/core/db_manager.rb b/lib/msf/core/db_manager.rb
@@ -678,7 +678,7 @@ def search_modules(search_string)
         union.or(condition)
       }
 
-      query = query.where(unioned_conditions).uniq
+      query = query.where(unioned_conditions).to_a.uniq { |m| m.fullname }
     end
 
     query

Original file line number	Diff line number	Diff line change
`@@ -678,7 +678,7 @@ def search_modules(search_string)`
`678`	`678`	`union.or(condition)`
`679`	`679`	`}`
`680`	`680`
`681`		`- query = query.where(unioned_conditions).uniq`
	`681`	`+ query = query.where(unioned_conditions).to_a.uniq { \|m\| m.fullname }`
`682`	`682`	`end`
`683`	`683`
`684`	`684`	`query`