aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2026-06-29 15:53:52 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2026-06-29 15:53:52 +0000
commitf52803e475d50f6d1996aa97c14be043e288185c (patch)
tree82ab4ad4bde21e1db54062c1e36737d0492667ea
parentb3a970fc9202cc7c9e80e1bcb83d7d860a3475c5 (diff)
Revert "libc/resolv: Export __res_conf_name"
This reverts commit 702c24ccc0c208e9bc697e775abe47ff723e3012.
-rw-r--r--lib/libc/resolv/Symbol.map4
-rw-r--r--lib/libc/resolv/res_init.c5
2 files changed, 1 insertions, 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) {