From 0c4498a7ccfecd7598d509f9ddba8fbbaca0e8d7 Mon Sep 17 00:00:00 2001
From: rfm <richardfrithmacdonald@gmail.com>
Date: Tue, 27 May 2025 14:11:54 +0100
Subject: [PATCH] More host tweaks

---
 Source/NSHost.m            | 17 +++--------------
 Tests/base/NSHost/basic.m  |  7 +++++--
 Tests/base/NSHost/create.m |  1 +
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/Source/NSHost.m b/Source/NSHost.m
index 35fe0076d..b4a9175e2 100644
--- a/Source/NSHost.m
+++ b/Source/NSHost.m
@@ -199,21 +199,10 @@ myHostName()
   hints.ai_flags = AI_CANONNAME;
   hints.ai_family = AF_UNSPEC; 
 
-  if ([key isEqualToString: myHostName()])
+  if ([key isEqualToString: localHostName])
     {
-      [addresses addObject: @"127.0.0.1"];
-#if     defined(AF_INET6)
-      [addresses addObject: @"::1"];
-#endif
-      [names addObject: @"localhost"];
-    }
-  else if ([key isEqualToString: localHostName]
-    || [key isEqualToString: @"localhost"])
-    {
-#if     defined(AF_INET6)
-      [addresses addObject: @"::1"];
-#endif
-      ptr = "127.0.0.1";
+      [addresses unionSet: [hostClass _localAddresses]];
+      ptr = "localhost";
     }
 
   err = getaddrinfo(ptr, 0, &hints, &entry);
diff --git a/Tests/base/NSHost/basic.m b/Tests/base/NSHost/basic.m
index 12d49e6dd..b0dea112c 100644
--- a/Tests/base/NSHost/basic.m
+++ b/Tests/base/NSHost/basic.m
@@ -6,8 +6,11 @@
 
 int main()
 {
-  NSAutoreleasePool   *arp = [NSAutoreleasePool new];
-  test_NSObject(@"NSHost",[NSArray arrayWithObject:[NSHost currentHost]]); 
+  NSAutoreleasePool     *arp = [NSAutoreleasePool new];
+  NSHost                *h = [NSHost currentHost];
+
+  test_NSObject(@"NSHost", [NSArray arrayWithObject: h]);
+  NSLog(@"%@", h);
   [arp release]; arp = nil;
   return 0;
 }
diff --git a/Tests/base/NSHost/create.m b/Tests/base/NSHost/create.m
index 9778e3963..8041b4ab8 100644
--- a/Tests/base/NSHost/create.m
+++ b/Tests/base/NSHost/create.m
@@ -18,6 +18,7 @@ int main()
   localh = [NSHost localHost];
   PASS(localh != nil && [localh isKindOfClass: [NSHost class]],
        "NSHost understands +localHost");
+  NSLog(@"localHost: %@", localh);
 #else
   localh = current;
 #endif