Merge 2aa4025f09 into 22a5194e18

nselib/smb.lua

@@ -117,6 +117,7 @@
 --                   to be the same protocol as port 445, not port 139. Since it probably isn't possible to change
 --                   Windows' ports normally, this is mostly useful if you're bouncing through a relay or something.
 -- @args randomseed   Set to a value to change the filenames/service names that are randomly generated.
+-- @args smbnativeos	Set the value of "Native OS", if not set, defaults to "Nmap".
 --
 -- @author Ron Bowes <ron@skullsecurity.net>
 -- @copyright Same as Nmap--See https://nmap.org/book/man-legal.html
@@ -1158,6 +1159,7 @@ local function start_session_basic(smb, log_errors, overrides)
   local os, lanmanager
   local username, domain, password, password_hash, hash_type
   local busy_count = 0
+  local nativeos
 
   header = smb_encode_header(smb, command_codes['SMB_COM_SESSION_SETUP_ANDX'], overrides)
 
@@ -1173,6 +1175,13 @@ local function start_session_basic(smb, log_errors, overrides)
     result, username, domain, password, password_hash, hash_type = smbauth.get_account(smb['host'])
   end
 
+  -- Get the value of Native OS or set to default
+  if (nmap.registry.args.smbnativeos ~= nil) then
+    nativeos = nmap.registry.args.smbnativeos
+  else
+    nativeos = "Nmap"
+  end
+  
   while result ~= false do
     local lanman, ntlm
 
@@ -1199,7 +1208,7 @@ local function start_session_basic(smb, log_errors, overrides)
     .. string.pack("<zzzz",
       username,               -- Account
       domain,                 -- Domain
-      "Nmap",                 -- OS
+	  nativeos,               -- OS
       "Native Lanman"         -- Native LAN Manager
       )
 
@@ -1317,6 +1326,7 @@ local function start_session_extended(smb, log_errors, overrides)
   local os, lanmanager
   local username, domain, password, password_hash, hash_type
   local busy_count = 0
+  local nativeos
 
   -- Set a default status_name, in case everything fails
   status_name = "An unknown error has occurred"
@@ -1335,6 +1345,13 @@ local function start_session_extended(smb, log_errors, overrides)
       return result, username
     end
   end
+  
+  -- Get the value of Native OS or set to default
+  if (nmap.registry.args.smbnativeos ~= nil) then
+    nativeos = nmap.registry.args.smbnativeos
+  else
+    nativeos = "Nmap"
+  end
 
   -- check what kind of security blob we were given in the negotiate protocol request
   local sp_nego = false
@@ -1398,7 +1415,7 @@ local function start_session_extended(smb, log_errors, overrides)
       -- Data is a list of strings, terminated by a blank one.
       data = security_blob -- Security blob
       .. string.pack("<zzz",
-        "Nmap",                -- OS
+        nativeos,              -- OS
         "Native Lanman",       -- Native LAN Manager
         ""                     -- Primary domain
         )