From nobody Mon Jun 29 15:52:19 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 4gprPw3lRhz6jNnk for ; Mon, 29 Jun 2026 15:52:20 +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 4gprPw0TShz3LDT for ; Mon, 29 Jun 2026 15:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782748340; 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=sUS8sbaFwr+pgywBsQVkm72iAaRdZGtmfQJa+1f3x34=; b=DJ+XUFpiRB5Jkbxg4ueSJAqgJewu2Ma6/EVEcKP3Aj2zvW2I4+3YCD1nz1pgJp6elVn0hU h6j8LGifv1cCqkylfHQs5WlkajhDF4d5nRN4s+NQcAL9bqHE1PQaWE6NjJAnE4KlQbGYiS WyIGSRjptyWE71cCXDifUpTybqEHLKJspci7nva4wepHKr+RUkxDm4MU2uvTFUPh1h4x92 6e970mfHOmk8BPuSVo6UVO3i+ojGbAA2b8Mpwuz5k5pAvnl83LwndWYsxV0T9aUCNZ+tv7 p1oLdaEwrmAUvD0chxtYHe//PYu6c/v+p/HOpe96g9Yt0g/wLN7zNzef4dKhmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782748340; a=rsa-sha256; cv=none; b=gqHkhEu40RF8hXd4vwWk534X4ji6Ga+XVfaBCyJ/0osWfyPD5XkEhrR61u4PpBxcu+kkqA Msrb8h4Nig8UQNH839IQDrEyBIZKZx3NUHrnRenLJsIOLglXWDvKFfHAD3RJMcVgqtlqjp jRzn/XIsWdSgGS2GAWfDmHdA2jyKOMLnEgV4KJpDpCXWyf1OBnJcTMVIhq6LxfeZTWREVZ 6stw/V43MLjT0aqN/C9LPoxf8g+weplzEeh4qoFptQ+o6W8tD8PsGKo7+g3B1Ftpmgdm52 S1FxEN4rx7zrvIEut7otZIK/bAvKdnayC/66fgNoAdYyYjO7/Au3AGTYTiZtsQ== 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=1782748340; 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=sUS8sbaFwr+pgywBsQVkm72iAaRdZGtmfQJa+1f3x34=; b=kUDDkt00aY/u/LovVZwoM4+vcJ6iR1G2Lu3uEZyaY0IAjIY1Q8RCZB5uiYu+Ep8AFGCgEr xEeRwIwT6IgZg00WbwAVnZKaQLHeQwOL1Tp5VSfShs8VPCprHRfs9WSKr5n/rqdOiO3qc2 xnsTSCdgWyCvyN5i8ElPXhFHGWXo0xMNkpdBNaKXVSh7IP+QyTfuiuYr53tcvMVH011Ffp y2475kKIJe3PACxFy/yCDgIAkvRAyaEtzw955VRGk09uJkqIE0pujO4tttHCa0sI9DYlWE 5aAifk9+WmYTcuCkaRJA2Tv25xWjChP6UxhJKtv3ZpqidkE2PxytpSizmD6Geg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gprPv6XkFz136Z for ; Mon, 29 Jun 2026 15:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bb5f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 15:52:19 +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: 702c24ccc0c2 - main - 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: 702c24ccc0c208e9bc697e775abe47ff723e3012 Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 15:52:19 +0000 Message-Id: <6a4294b3.3bb5f.169e151b@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=702c24ccc0c208e9bc697e775abe47ff723e3012 commit 702c24ccc0c208e9bc697e775abe47ff723e3012 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-28 09:37:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-29 13:49:20 +0000 libc/resolv: Export __res_conf_name Add a new global variable, __res_conf_name, which is initialized to _PATH_RESCONF and used in its place by res_init(). This allows test programs (and applications) to select a different configuration file to read instead of /etc/resolv.conf. PR: 220610 --- lib/libc/resolv/Symbol.map | 4 ++++ lib/libc/resolv/res_init.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/libc/resolv/Symbol.map b/lib/libc/resolv/Symbol.map index 26daecbe2eff..c12d594a7e6b 100644 --- a/lib/libc/resolv/Symbol.map +++ b/lib/libc/resolv/Symbol.map @@ -105,3 +105,7 @@ 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 64522ef8f562..7466193e7476 100644 --- a/lib/libc/resolv/res_init.c +++ b/lib/libc/resolv/res_init.c @@ -116,6 +116,8 @@ 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. */ @@ -214,7 +216,8 @@ __res_vinit(res_state statp, int preinit) res_setservers(statp, u, nitems(u)); /* read the configuration file */ - res_readconf(statp, _PATH_RESCONF, maxns); + if (__res_conf_name != NULL) + res_readconf(statp, __res_conf_name, maxns); /* Allow user to override the local domain definition */ if ((cp = secure_getenv("LOCALDOMAIN")) != NULL) {