From: florian <florian@openbsd.org>
Date: Mon, 19 Aug 2024 05:58:41 +0000 (+0000)
Subject: Replace too flexible inet_aton(3) with getaddrinfo(3).
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a81015d08821b7ee63c5985e26ee60e2aef43e96;p=openbsd

Replace too flexible inet_aton(3) with getaddrinfo(3).

0xdecafbad will no longer work as an IPv4 address, sorry.

OK bluhm
---

diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 1c2ecf8fbaa..a1163d4cbb4 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_nfs.c,v 1.55 2020/01/22 06:24:08 tedu Exp $	*/
+/*	$OpenBSD: mount_nfs.c,v 1.56 2024/08/19 05:58:41 florian Exp $	*/
 /*	$NetBSD: mount_nfs.c,v 1.12.4.1 1996/05/25 22:48:05 fvdl Exp $	*/
 
 /*
@@ -383,7 +383,7 @@ int
 getnfsargs(char *spec, struct nfs_args *nfsargsp)
 {
 	CLIENT *clp;
-	struct hostent *hp;
+	struct addrinfo hints, *res;
 	static struct sockaddr_in saddr;
 	struct timeval pertry, try;
 	enum clnt_stat clnt_stat;
@@ -411,14 +411,15 @@ getnfsargs(char *spec, struct nfs_args *nfsargsp)
 	/*
 	 * Handle an internet host address
 	 */
-	if (inet_aton(hostp, &saddr.sin_addr) == 0) {
-		hp = gethostbyname(hostp);
-		if (hp == NULL) {
-			warnx("can't resolve address for host %s", hostp);
-			return (0);
-		}
-		memcpy(&saddr.sin_addr, hp->h_addr, hp->h_length);
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = AF_INET;
+
+	if (getaddrinfo(hostp, NULL, &hints, &res) != 0) {
+		warnx("can't resolve address for host %s", hostp);
+		return (0);
 	}
+	saddr.sin_addr = ((struct sockaddr_in *)res->ai_addr)->sin_addr;
+	freeaddrinfo(res);
 
 	if (force2) {
 		nfsvers = NFS_VER2;