networking.rb in facter-4.0.50

- old
+ new

@@ -8,11 +8,11 @@
         init_resolver
 
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_network_information(fact_name) }
           end
 
           def read_network_information(fact_name)
             require 'facter/resolvers/windows/ffi/networking_ffi'
@@ -22,16 +22,16 @@
             flags = NetworkingFFI::GAA_FLAG_SKIP_ANYCAST |
                     NetworkingFFI::GAA_FLAG_SKIP_MULTICAST | NetworkingFFI::GAA_FLAG_SKIP_DNS_SERVER
 
             return unless (adapter_addresses = get_adapter_addresses(size_ptr, adapter_addresses, flags))
 
+            retrieve_domain_from_registry
+
             iterate_list(adapter_addresses)
 
             Facter::Util::Resolvers::Networking.expand_main_bindings(@fact_list)
 
-            retrieve_domain_from_registry if !@fact_list[:domain] || @fact_list[:domain].empty?
-
             @fact_list[fact_name]
           end
 
           def get_adapter_addresses(size_ptr, adapter_addresses, flags)
             error = nil
@@ -69,10 +69,14 @@
             IpAdapterAddressesLh.read_list(adapter_addresses) do |adapter_address|
               if adapter_down?(adapter_address)
                 adapter_address = IpAdapterAddressesLh.new(adapter_address[:Next])
                 next
               end
-              @fact_list[:domain] ||= adapter_address[:DnsSuffix].read_wide_string_without_length
+
+              if !@fact_list[:domain] || @fact_list[:domain].empty?
+                @fact_list[:domain] = adapter_address[:DnsSuffix].read_wide_string_without_length
+              end
+
               name = adapter_address[:FriendlyName].read_wide_string_without_length
               net_interface[name] = build_interface_info(adapter_address, name)
             end
 
             @fact_list[:interfaces] = net_interface unless net_interface.empty?