Consolidate tunnel check into name check

2015-04-20 21:18:12 -05:00 · 2015-04-20 21:18:12 -05:00 · 74ad81c90c
parent 741149058c
commit 74ad81c90c
1 changed files with 1 additions and 6 deletions
--- a/lib/msf/core/db_manager/import/nmap.rb
+++ b/lib/msf/core/db_manager/import/nmap.rb
@ -164,12 +164,7 @@ module Msf::DBManager::Import::Nmap
        data[:host]  = hobj || addr
        data[:info]  = extra if not extra.empty?
        data[:task]  = args[:task]
-        if p["name"]
-          data[:name] = p["name"]
-        end
-        if p['tunnel']
-          data[:name] = "#{p['tunnel']}/#{data['name'] || 'unknown'}"
-        end
+        data[:name]  = p['tunnel'] ? "#{p['tunnel']}/#{p['name'] || 'unknown'}" : p['name']
        report_service(data)
      }
      #Parse the scripts output