o [NSE] Applied patch from Daniel Miller that fixes bug in several scripts and

libraries http://seclists.org/nmap-dev/2012/q2/593 [Daniel Miller]

CHANGELOG

@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [NSE] Applied patch from Daniel Miller that fixes bug in several scripts and
+  libraries http://seclists.org/nmap-dev/2012/q2/593 [Daniel Miller]
+
 o [NSE] Added the script smb-ls that lists files on SMB shares and produces
   output similar to the dir command on Windows. [Patrik Karlsson]
 

nselib/dns.lua

@@ -746,7 +746,7 @@ end
 -- @param fqdn containing the fully qualified domain name
 -- @return encQ containing the encoded value
 local function encodeFQDN(fqdn)
-    if ( not(fqdn) or #fqdn == 0 ) then return end
+    if ( not(fqdn) or #fqdn == 0 ) then return string.char(0) end
 
     local parts = stdnse.strsplit("%.", fqdn)
     local encQ = ""

scripts/traceroute-geolocation.nse

@@ -4,6 +4,7 @@ local json = require "json"
 local stdnse = require "stdnse"
 local tab = require "tab"
 local table = require "table"
+local ipOps = require "ipOps"
 
 description = [[
 Lists the geographic locations of each hop in a traceroute and optionally
@@ -97,7 +98,7 @@ action = function(host)
 				name = ("%s"):format(hop.ip)
 			end
 			local rtt = tonumber(hop.times.srtt) * 1000
-			if ( not(ipops.isPrivate(hop.ip) ) ) then
+			if ( not(ipOps.isPrivate(hop.ip) ) ) then
 				local lat, lon, reg, ctry = geoLookup(hop.ip)
 				table.insert(coordinates, { hop = count, lat = lat, lon = lon })
 				tab.addrow( output, count, ("%.2f"):format(rtt), name, ("%d,%d %s (%s)"):format(lat, lon, ctry, reg) )

scripts/wsdd-discover.nse

@@ -50,12 +50,8 @@ discoverThread = function( funcname, host, port, results )
 	local helper = wsdd.Helper:new(host, port)
 	helper:setTimeout(timeout)
 	
-	if ( func ) then
 	local status, result = helper[funcname](helper)
 	if ( status ) then table.insert(results, result) end
-	else
-		stdnse.print_debug("ERROR: Failed to call function: %s", funcname)
-	end
 	condvar("broadcast")
 end