From 37ef46264af6a0d05ea3622d596a73abf042244a Mon Sep 17 00:00:00 2001
From: Samuel Huckins <samuel_huckins@rapid7.com>
Date: Thu, 5 Feb 2015 14:05:24 -0600
Subject: [PATCH] Pulling in latest MDM and credential versions

* Fully removing service uniqueness validation for now, more work to be
done on that to avoid regressions.
---
 Gemfile.lock                    | 10 +++++-----
 db/schema.rb                    |  3 +--
 metasploit-framework-db.gemspec |  4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e5fbc1cb28..64fb8cd493 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -22,9 +22,9 @@ PATH
       tzinfo
     metasploit-framework-db (4.11.0.pre.dev)
       activerecord (>= 3.2.21, < 4.0.0)
-      metasploit-credential (~> 0.13.16)
+      metasploit-credential (~> 0.13.17)
       metasploit-framework (= 4.11.0.pre.dev)
-      metasploit_data_models (~> 0.22.5)
+      metasploit_data_models (~> 0.22.6)
       pg (>= 0.11)
     metasploit-framework-pcap (4.11.0.pre.dev)
       metasploit-framework (= 4.11.0.pre.dev)
@@ -112,10 +112,10 @@ GEM
     metasploit-concern (0.3.0)
       activesupport (~> 3.0, >= 3.0.0)
       railties (< 4.0.0)
-    metasploit-credential (0.13.16)
+    metasploit-credential (0.13.17)
       metasploit-concern (~> 0.3.0)
       metasploit-model (~> 0.28.0)
-      metasploit_data_models (~> 0.22.5)
+      metasploit_data_models (~> 0.22.6)
       pg
       railties (< 4.0.0)
       rubyntlm
@@ -123,7 +123,7 @@ GEM
     metasploit-model (0.28.0)
       activesupport
       railties (< 4.0.0)
-    metasploit_data_models (0.22.5)
+    metasploit_data_models (0.22.6)
       activerecord (>= 3.2.13, < 4.0.0)
       activesupport
       arel-helpers
diff --git a/db/schema.rb b/db/schema.rb
index f7296903b9..057c061e40 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150112203945) do
+ActiveRecord::Schema.define(:version => 20150205192745) do
 
   create_table "api_keys", :force => true do |t|
     t.text     "token"
@@ -454,7 +454,6 @@ ActiveRecord::Schema.define(:version => 20150112203945) do
     t.text     "info"
   end
 
-  add_index "services", ["host_id", "port", "proto"], :name => "index_services_on_host_id_and_port_and_proto", :unique => true
   add_index "services", ["name"], :name => "index_services_on_name"
   add_index "services", ["port"], :name => "index_services_on_port"
   add_index "services", ["proto"], :name => "index_services_on_proto"
diff --git a/metasploit-framework-db.gemspec b/metasploit-framework-db.gemspec
index 8a2baacaad..f617dcad62 100644
--- a/metasploit-framework-db.gemspec
+++ b/metasploit-framework-db.gemspec
@@ -29,9 +29,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activerecord', *Metasploit::Framework::RailsVersionConstraint::RAILS_VERSION
   # Metasploit::Credential database models
-  spec.add_runtime_dependency 'metasploit-credential', '~> 0.13.16'
+  spec.add_runtime_dependency 'metasploit-credential', '~> 0.13.17'
   # Database models shared between framework and Pro.
-  spec.add_runtime_dependency 'metasploit_data_models', '~> 0.22.5'
+  spec.add_runtime_dependency 'metasploit_data_models', '~> 0.22.6'
   # depend on metasploit-framewrok as the optional gems are useless with the actual code
   spec.add_runtime_dependency 'metasploit-framework', "= #{spec.version}"
   # Needed for module caching in Mdm::ModuleDetails