Make sure we get the field :value

Author: Meatballs1

modules/post/windows/gather/enum_ad_computers.rb

@@ -81,14 +81,14 @@ def run
 
       report = {}
       0.upto(fields.length-1) do |i|
-        field = result[i] || ""
+        field = result[i][:value] || ""
 
         # Only perform these actions if the database is connected and we want
         # to store in the DB.
         if db && datastore['STORE_DB']
           case fields[i]
           when 'dNSHostName'
-            dns = field
+            dns = field.value
             report[:name] = dns
             hostnames << dns
           when 'operatingSystem'

modules/post/windows/gather/enum_ad_service_principal_names.rb

@@ -100,7 +100,7 @@ def parse_result(result, fields)
     row = []
 
     0.upto(fields.length-1) do |i|
-      field = (result[i].nil? ? "" : result[i])
+      field = (result[i][:value].nil? ? "" : result[i][:value])
 
       if fields[i] == 'servicePrincipalName'
         break if field.blank?

modules/post/windows/gather/enum_ad_to_wordlist.rb

@@ -26,7 +26,6 @@ class Metasploit3 < Msf::Post
     'company',
     'streetAddress',
     'sAMAccountName',
-    'userAccountControl',
     'comment',
     'description'
   ]
@@ -37,7 +36,7 @@ def initialize(info={})
       'Description'  => %q{
         This module will gather information from the default Active Domain (AD) directory
         and use these words to seed a wordlist. By default it enumerates user accounts to
-        build the wordlist
+        build the wordlist.
       },
       'License'      => MSF_LICENSE,
       'Author'       => ['Thomas Ring'],
@@ -69,7 +68,7 @@ def run
     @words_dict = {}
     q[:results].each do |result|
       result.each do |field|
-        search_words(field)
+        search_words(field[:value])
       end # result.each
     end # q.each
 

modules/post/windows/gather/enum_ad_user_comments.rb

@@ -65,10 +65,11 @@ def run
 
       report = {}
       result.each do |field|
-        if field.nil?
+        if field[:value].nil?
           row << ""
         else
-          row << field
+          row << field[:value]
+
         end
       end