From 370825918ae9ff0db5761d6021f87e668390ef5c Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Wed, 21 Feb 2018 03:10:27 +0000
Subject: [PATCH] Avoid empty script output

---
 scripts/hadoop-datanode-info.nse    | 3 ++-
 scripts/hadoop-jobtracker-info.nse  | 6 ++++--
 scripts/hadoop-namenode-info.nse    | 2 +-
 scripts/hadoop-tasktracker-info.nse | 2 +-
 scripts/hbase-master-info.nse       | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/hadoop-datanode-info.nse b/scripts/hadoop-datanode-info.nse
index 97af4bf25..4bf12cb46 100644
--- a/scripts/hadoop-datanode-info.nse
+++ b/scripts/hadoop-datanode-info.nse
@@ -46,7 +46,6 @@ action = function( host, port )
   stdnse.debug1("Status %s",response['status-line'] or "No Response")
   if response['status-line'] and response['status-line']:match("200%s+OK") and response['body']  then
     local body = response['body']:gsub("%%","%%%%")
-    stdnse.debug2("Body %s\n",body)
     if body:match("([^][\"]+)\">Log") then
       port.version.name = "hadoop-datanode"
       port.version.product = "Apache Hadoop"
@@ -55,6 +54,8 @@ action = function( host, port )
       stdnse.debug1("Logs %s",logs)
       result["Logs"] = logs
     end
+  end
+  if #result > 0 then
     return result
   end
 end
diff --git a/scripts/hadoop-jobtracker-info.nse b/scripts/hadoop-jobtracker-info.nse
index 19e85c137..53a361985 100644
--- a/scripts/hadoop-jobtracker-info.nse
+++ b/scripts/hadoop-jobtracker-info.nse
@@ -90,7 +90,9 @@ local get_userhistory = function( host, port )
       end
     end
   end
-  return results
+  if #results > 0 then
+    return results
+  end
 end
 local get_tasktrackers = function( host, port )
   local results = {}
@@ -174,6 +176,6 @@ action = function( host, port )
     port.version.name = "hadoop-jobtracker"
     port.version.product = "Apache Hadoop"
     nmap.set_port_version(host, port)
+    return result
   end
-  return result
 end
diff --git a/scripts/hadoop-namenode-info.nse b/scripts/hadoop-namenode-info.nse
index 5433d8871..f0fed4991 100644
--- a/scripts/hadoop-namenode-info.nse
+++ b/scripts/hadoop-namenode-info.nse
@@ -174,7 +174,7 @@ action = function( host, port )
       port.version.name = "hadoop-namenode"
       port.version.product = "Apache Hadoop"
       nmap.set_port_version(host, port)
+      return result
     end
-    return stdnse.format_output(true, result)
   end
 end
diff --git a/scripts/hadoop-tasktracker-info.nse b/scripts/hadoop-tasktracker-info.nse
index 3f60feb52..bc236f0fb 100644
--- a/scripts/hadoop-tasktracker-info.nse
+++ b/scripts/hadoop-tasktracker-info.nse
@@ -74,7 +74,7 @@ action = function( host, port )
       port.version.name = "hadoop-tasktracker"
       port.version.product = "Apache Hadoop"
       nmap.set_port_version(host, port)
+      return result
     end
-    return result
   end
 end
diff --git a/scripts/hbase-master-info.nse b/scripts/hbase-master-info.nse
index 3892855d0..8a3ac13d9 100644
--- a/scripts/hbase-master-info.nse
+++ b/scripts/hbase-master-info.nse
@@ -140,6 +140,6 @@ action = function( host, port )
     port.version.name = "hbase-master"
     port.version.product = "Apache Hadoop Hbase"
     nmap.set_port_version(host, port)
+    return result
   end
-  return result
 end