Merge branch 'master' into release

rapid7 · Oct 31, 2012 · 67d0367 · 67d0367
2 parents d9503e6 + 357fd1b
commit 67d0367
Show file tree

Hide file tree

Showing 376 changed files with 2,172 additions and 488 deletions.
diff --git a/lib/msf/core/db_manager.rb b/lib/msf/core/db_manager.rb
@@ -588,8 +588,8 @@ def search_modules(search_string, inclusive=false)
 					where_v << [ xv, xv ]
 				when 'os','platform'
 					xv = "%#{kv}%"
-					where_q << ' ( module_targets.name ILIKE ? ) '
-					where_v << [ xv ]
+					where_q << ' (  module_platforms.name ILIKE ? OR module_targets.name ILIKE ? ) '
+					where_v << [ xv, xv ]
 				when 'port'
 					# TODO
 				when 'type'

diff --git a/lib/msf/core/exploit/mixins.rb b/lib/msf/core/exploit/mixins.rb
@@ -88,3 +88,6 @@
 # WBEM
 require 'msf/core/exploit/wbemexec'
 
+#WinRM
+require 'msf/core/exploit/winrm'
+