From nobody Mon Jun 29 15:54:16 2026 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 4gprS83b0Qz6jNqC for ; Mon, 29 Jun 2026 15:54:16 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gprS81f01z3QFL for ; Mon, 29 Jun 2026 15:54:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782748456; 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=eXApsCYZJBVxxOwZ8/qt2QL9u0vEHC3JTmSs9YN6iTk=; b=bhD0YiTnN43tMXfhGX1pMEPRtXqfhKF+JYaREJ7qz+Yt1jeGxp2paLEAMZqFecaRXTqON0 wfxMgqtopcuTXgJEoUMfEP1kjlVf2FaY9NvYN5IzJ+k3nJziU87VzH20AxpyygAH3WfDcX GSS5Wz0TfkN3/pv6iNH+KTB8alap47YmeYq+51aaow3RS1sJ7kW+k0ODaKAe9FVnfg+ogo u0DnkIDCe9Lx3GgPAJlRdoEaaGF454zW/3Ifdv/2qEC0LY2sD4NCJffH2qTD+MLdOM8Laz NXJw4kATC/GsyQj4VLVAlCw1IugkqZG05FyBYXqUsCneEyeeRQFDyoJe93M1CQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782748456; a=rsa-sha256; cv=none; b=SfLZnSU8YDhxpG3G+96/aJ2e4CJOtAqy+wiK9Ef7Rtri5Lv86H03wsxV9pu048C/l5IzXT 1fINn8h123mPhVilu4SMEOhr1RemkdnO4s4wlzHYpKTdrkT81uAvnOnXxZiW98cOi7GTIt cggavxmQPW3GFt2HV8Rin690Y+u0h5xzslfvqQYdcblBqkSjbIjrKRQ9Wy57YMjQYVWqVU AzBo/JRUqhoN65S18Gq+3ruG3gsfeUMtZAEVWbUwe49MB492fnyi0P1fWEDo0Xn77AzPoQ 4Wq6nOJ9tAAjCuvqrD+w6pjaycfuhpvxhu+CKrNYKF9kcmGMzgZMWBxE/aP6MQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782748456; 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=eXApsCYZJBVxxOwZ8/qt2QL9u0vEHC3JTmSs9YN6iTk=; b=czlwepZgF7hYpQDUzlYfd4nfkCgVme2D08bdNOyiqJx3/RcmCmCidtbk1tU9df8vG/uEZy JLNlzp6TwSbll9gMocgtGA1Pkyz/4KSOQ+HSoUsoqTs/uF4a6GTX7XqOf4OUtdqP0sz5pS xGJAucqqfcSGGmWnYZ+FP1RU67B2NDNdan47iGgsGukkuF5KYXPASLRqRcX+Yyh9gjm44/ 1UzUfr2aIizFqvejoKS4/Qk+85FTJiyQU4PJ/6YpexW24bF5DvUVcUj69pwaOpVrJwUfWZ 1DSx1eF4IrmFVxk0gvwBG6TPqTNN2v0kLCraBjce26/VmLs0w0ZQGvzcLMALjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gprS80GRsz13df for ; Mon, 29 Jun 2026 15:54:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b99a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 15:54:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: f52803e475d5 - main - Revert "libc/resolv: Export __res_conf_name" 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f52803e475d50f6d1996aa97c14be043e288185c Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 15:54:16 +0000 Message-Id: <6a429528.3b99a.1d434859@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f52803e475d50f6d1996aa97c14be043e288185c commit f52803e475d50f6d1996aa97c14be043e288185c Author: Dag-Erling Smørgrav AuthorDate: 2026-06-29 15:53:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-29 15:53:52 +0000 Revert "libc/resolv: Export __res_conf_name" This reverts commit 702c24ccc0c208e9bc697e775abe47ff723e3012. --- lib/libc/resolv/Symbol.map | 4 ---- lib/libc/resolv/res_init.c | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/libc/resolv/Symbol.map b/lib/libc/resolv/Symbol.map index c12d594a7e6b..26daecbe2eff 100644 --- a/lib/libc/resolv/Symbol.map +++ b/lib/libc/resolv/Symbol.map @@ -105,7 +105,3 @@ FBSD_1.0 { FBSD_1.4 { __res_nrandomid; }; - -FBSD_1.9 { - __res_conf_name; -}; diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c index 7466193e7476..64522ef8f562 100644 --- a/lib/libc/resolv/res_init.c +++ b/lib/libc/resolv/res_init.c @@ -116,8 +116,6 @@ static int res_setsortlist(res_state, int, const char *, const char *); (strncmp((str), (word), (end) - (str)) == 0 && \ (word)[(end) - (str)] == '\0') -const char *__res_conf_name = _PATH_RESCONF; - /* * Resolver state default settings. */ @@ -216,8 +214,7 @@ __res_vinit(res_state statp, int preinit) res_setservers(statp, u, nitems(u)); /* read the configuration file */ - if (__res_conf_name != NULL) - res_readconf(statp, __res_conf_name, maxns); + res_readconf(statp, _PATH_RESCONF, maxns); /* Allow user to override the local domain definition */ if ((cp = secure_getenv("LOCALDOMAIN")) != NULL) {