From nobody Fri Dec 10 16:29:13 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7CFA418D68C4; Fri, 10 Dec 2021 16:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J9bvY5bS7z3DsH; Fri, 10 Dec 2021 16:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 367371DA49; Fri, 10 Dec 2021 16:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BAGTD7X076957; Fri, 10 Dec 2021 16:29:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BAGTDV9076956; Fri, 10 Dec 2021 16:29:13 GMT (envelope-from git) Date: Fri, 10 Dec 2021 16:29:13 GMT Message-Id: <202112101629.1BAGTDV9076956@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 1ab4b70db5d0 - stable/13 - res_init: remove unused inet_makeaddr with IN_LOOPBACKNET List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1ab4b70db5d06497698438215cf007f5e1d79f4d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639153753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VPNj3/OVLpmqoWut8+V2t2SWWjOWtcbox2manXy0VhI=; b=Z1UPCL55X/RafIxJb1MsF26Dw9/jk2KynKJMR3NTZ0Y+meL+wQp2/GuflRekSZzhLTSU3q ccAKDoSturrOcNfof3HtFlDLNkS1f4fhm9ust41YgsMZNZruog+aV+q5k/kB6QkejN++fh jQEF4RQbO91WgEfqY2iBJBaMb3PhTzx/LgJAhTmVuGUUI5tlSJAfkfBp1wt8r0aWeuZo98 h0v9lsMVM6zbFtRiid1X1P9uBiD39UnX9FbDgFU1EF7I/lGb7i8HF16v2Tmeto2ornDyTs 79xHMxKPnzmkblLmERyVHxXwigN8Lc5AXcH6Ob3CwmFU/qx8ynwYKUTk1cby1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639153753; a=rsa-sha256; cv=none; b=jIaxtQp06an1Ij/V4rlmmJGzWtl6m6tBie5cId+2NZ0MzCnjbatbkR1bz4pq5/CkAzRbX5 J1mLEdihQILSz4S+sBxTJvkPtdSuk6Rs93MHeCx5xuN1gFizLtlE9MrB/orYnPmu2T6nDo ha8xtmdSzgX4mKHIpAun8olAgKf2/LN7UcCOHH5d5/erP12P/vDv7NvN7LeekTgfiRTWL1 t4fnw0Lsfn+Qbhq/wQGjukzr9g6wg+Ut7c+5XyVLqCROZq8Er58iCjJGbXjFMZDvW5myQw UIhd8A3Aio/o7GWDVk7QYyoK0A5eysYosHbZlRap8AArK5pTylrVIrZI2hTFCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=1ab4b70db5d06497698438215cf007f5e1d79f4d commit 1ab4b70db5d06497698438215cf007f5e1d79f4d Author: Mike Karels AuthorDate: 2021-10-27 03:33:36 +0000 Commit: Mike Karels 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