From 9fbd30f1914d357dcf76e7214c7feb30c4ee70fb Mon Sep 17 00:00:00 2001 From: dmiller Date: Thu, 16 Aug 2012 15:46:37 +0000 Subject: [PATCH] Use ISO8601 time for smb-os-discovery --- nselib/smb.lua | 2 ++ scripts/smb-os-discovery.nse | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nselib/smb.lua b/nselib/smb.lua index 205c4e7cf..a8641ffaa 100644 --- a/nselib/smb.lua +++ b/nselib/smb.lua @@ -3266,7 +3266,9 @@ function get_os(host) response['domain'] = smbstate['domain'] response['server'] = smbstate['server'] response['date'] = smbstate['date'] + response['time'] = smbstate['time'] response['timezone_str'] = smbstate['timezone_str'] + response['timezone'] = smbstate['timezone'] -- Kill SMB stop(smbstate) diff --git a/scripts/smb-os-discovery.nse b/scripts/smb-os-discovery.nse index 826847d86..a75b7cab2 100644 --- a/scripts/smb-os-discovery.nse +++ b/scripts/smb-os-discovery.nse @@ -124,7 +124,7 @@ action = function(host) os_string = string.format( "%s (%s)", get_windows_version( result['os'] ), result['lanmanager'] ) end if (result['date'] and result['timezone_str']) then - time_string = string.format("%s %s", result['date'], result['timezone_str']) + time_string = string.format("%s%+03d%02d", os.date("%Y-%m-%dT%H:%M:%S", result.time), result.timezone, math.abs(math.fmod(result.timezone, 1)) * 60) end