We always pass a Service, get rid of port/proto

lib/msf/core/db_manager/exploit_attempt.rb

@@ -33,8 +33,6 @@ module Msf::DBManager::ExploitAttempt
     wspace = opts.delete(:workspace) || workspace
     mrefs  = opts.delete(:refs) || return
     host   = opts.delete(:host)
-    port   = opts.delete(:port)
-    prot   = opts.delete(:proto)
     svc    = opts.delete(:service)
     vuln   = opts.delete(:vuln)
 
@@ -47,12 +45,6 @@ module Msf::DBManager::ExploitAttempt
     # Bail if we dont have a host object
     return if not host
 
-    # Look up the service as appropriate
-    if port and svc.nil?
-      prot ||= "tcp"
-      svc = get_service(wspace, host, prot, port)
-    end
-
     if not vuln
       # Create a references map from the module list
       ref_objs = ::Mdm::Ref.where(:name => mrefs.map { |ref|
@@ -89,11 +81,6 @@ module Msf::DBManager::ExploitAttempt
       attempt_info[:proto] = svc.proto
     end
 
-    if port and svc.nil?
-      attempt_info[:port]  = port
-      attempt_info[:proto] = prot || "tcp"
-    end
-
     host.exploit_attempts.create(attempt_info)
   }
   end
@@ -104,8 +91,6 @@ module Msf::DBManager::ExploitAttempt
     wspace = opts.delete(:workspace) || workspace
     mrefs  = opts.delete(:refs) || return
     host   = opts.delete(:host)
-    port   = opts.delete(:port)
-    prot   = opts.delete(:proto)
     svc    = opts.delete(:service)
     vuln   = opts.delete(:vuln)
 
@@ -118,11 +103,6 @@ module Msf::DBManager::ExploitAttempt
     # Bail if we dont have a host object
     return if not host
 
-    # Look up or generate the service as appropriate
-    if port and svc.nil?
-      svc = report_service(:workspace => wspace, :host => host, :port => port, :proto => prot )
-    end
-
     if not vuln
       # Create a references map from the module list
       ref_objs = ::Mdm::Ref.where(:name => mrefs.map { |ref|
@@ -166,11 +146,6 @@ module Msf::DBManager::ExploitAttempt
       attempt_info[:proto] = svc.proto
     end
 
-    if port and svc.nil?
-      attempt_info[:port]  = port
-      attempt_info[:proto] = prot || "tcp"
-    end
-
     host.exploit_attempts.create(attempt_info)
   }
   end