From f274c3f0ba6b100ac8717cce79dd8043094eba68 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 28 Jun 2024 10:34:49 +1000
Subject: Replace inet_addr()/inet_aton() with a call to inet_pton()

We unconditionally require inet_pton() for our IPv6 check so let's use
the same call for the IPv4 check too. This removes the need for
inet_aton() which is labelled as deprecated because it doesn't support
IPv6.

Part-of: <https://gitlab.freedesktop.org/xorg/app/xhost/-/merge_requests/8>
---
 xhost.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'xhost.c')

diff --git a/xhost.c b/xhost.c
index 22304bd..26ba179 100644
--- a/xhost.c
+++ b/xhost.c
@@ -544,12 +544,7 @@ change_host(Display *dpy, char *name, Bool add)
      * First see if inet_aton/inet_addr can grok the name; if so, then use it.
      */
     if (((family == FamilyWild) || (family == FamilyInternet)) &&
-#ifdef HAVE_INET_ATON
-	(inet_aton (name, &addr) != 0)
-#else
-	((addr.s_addr = inet_addr(name)) != -1)
-#endif
-        ) {
+	(inet_pton (AF_INET, name, &addr) == 1)) {
 	ha.family = FamilyInternet;
 	ha.length = sizeof(addr.s_addr);
 	ha.address = (char *) &addr.s_addr;
-- 
cgit v1.2.3