D57957.id180957.diff
No OneTemporary
Actions

Size

904 B

Referenced Files

None

Subscribers

None

D57957.id180957.diff
View Options

	diff --git a/lib/libc/resolv/Symbol.map b/lib/libc/resolv/Symbol.map
	--- a/lib/libc/resolv/Symbol.map
	+++ b/lib/libc/resolv/Symbol.map
	@@ -105,3 +105,7 @@
	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
	--- a/lib/libc/resolv/res_init.c
	+++ b/lib/libc/resolv/res_init.c
	@@ -116,6 +116,8 @@
	(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_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) {