From e6b4e2de6dd91efdcac80b79149c596de8a26b70 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Tue, 27 Jun 2017 09:26:46 +0200
Subject: resolv: Call _res_hconf_init from __res_vinit

Many callers of __res_maybe_init also call _res_hconf_init.
Additional calls to the latter do not hurt because the function
does its work only once.  (/etc/hosts.conf is not reloaded or
even checked for changes.)  This means that we can simplify the
code by calling _res_hconf_init directly from __res_vinit.
---
 nss/getXXbyYY_r.c | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'nss')

diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c
index 5962475737..7cab825cf0 100644
--- a/nss/getXXbyYY_r.c
+++ b/nss/getXXbyYY_r.c
@@ -25,9 +25,6 @@
 #ifdef USE_NSCD
 # include <nscd/nscd_proto.h>
 #endif
-#ifdef NEED__RES_HCONF
-# include <resolv/res_hconf.h>
-#endif
 #ifdef NEED__RES
 # include <resolv.h>
 #endif
@@ -273,9 +270,6 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
 	      return errno;
 	    }
 #endif /* need _res */
-#ifdef NEED__RES_HCONF
-	  _res_hconf_init ();
-#endif /* need _res_hconf */
 
 	  void *tmp_ptr = fct.l;
 #ifdef PTR_MANGLE
-- 
cgit v1.2.3