Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 10 Dec 2021 16:29:13 GMT
From:      Mike Karels <karels@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 1ab4b70db5d0 - stable/13 - res_init: remove unused inet_makeaddr with IN_LOOPBACKNET
Message-ID:  <202112101629.1BAGTDV9076956@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by karels:

URL: https://cgit.FreeBSD.org/src/commit/?id=1ab4b70db5d06497698438215cf007f5e1d79f4d

commit 1ab4b70db5d06497698438215cf007f5e1d79f4d
Author:     Mike Karels <karels@FreeBSD.org>
AuthorDate: 2021-10-27 03:33:36 +0000
Commit:     Mike Karels <karels@FreeBSD.org>
CommitDate: 2021-12-10 16:26:14 +0000

    res_init: remove unused inet_makeaddr with IN_LOOPBACKNET
    
    Remove code that is ifdefed out on USELOOPBACK, which uses historical
    class.  No functional change intended.
    
    (cherry picked from commit 0bf7f99b2a1f50fa68e167269a633b4b5451fa35)
---
 lib/libc/resolv/res_init.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c
index 515c86c2378d..274ffbf999d6 100644
--- a/lib/libc/resolv/res_init.c
+++ b/lib/libc/resolv/res_init.c
@@ -202,11 +202,7 @@ __res_vinit(res_state statp, int preinit) {
 	statp->id = res_nrandomid(statp);
 
 	memset(u, 0, sizeof(u));
-#ifdef USELOOPBACK
-	u[nserv].sin.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
-#else
 	u[nserv].sin.sin_addr.s_addr = INADDR_ANY;
-#endif
 	u[nserv].sin.sin_family = AF_INET;
 	u[nserv].sin.sin_port = htons(NAMESERVER_PORT);
 #ifdef HAVE_SA_LEN
@@ -214,11 +210,7 @@ __res_vinit(res_state statp, int preinit) {
 #endif
 	nserv++;
 #ifdef HAS_INET6_STRUCTS
-#ifdef USELOOPBACK
-	u[nserv].sin6.sin6_addr = in6addr_loopback;
-#else
 	u[nserv].sin6.sin6_addr = in6addr_any;
-#endif
 	u[nserv].sin6.sin6_family = AF_INET6;
 	u[nserv].sin6.sin6_port = htons(NAMESERVER_PORT);
 #ifdef HAVE_SA_LEN



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112101629.1BAGTDV9076956>