about summary refs log tree commit diff
path: root/sysdeps/posix
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-06-27 09:26:46 +0200
committerFlorian Weimer <fweimer@redhat.com>2017-06-27 09:26:46 +0200
commite6b4e2de6dd91efdcac80b79149c596de8a26b70 (patch)
tree4ac5b1cb2d8b5df219fa0b0be3290534cbccd0e7 /sysdeps/posix
parent034e73802173a8bfa80ff21d3da45e3bbbfe8acc (diff)
downloadglibc-e6b4e2de6dd91efdcac80b79149c596de8a26b70.tar.gz
glibc-e6b4e2de6dd91efdcac80b79149c596de8a26b70.tar.xz
glibc-e6b4e2de6dd91efdcac80b79149c596de8a26b70.zip
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.
Diffstat (limited to 'sysdeps/posix')
-rw-r--r--sysdeps/posix/getaddrinfo.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 91e0a76c5c..4fb1eaef79 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -80,7 +80,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <not-cancel.h>
 #include <nscd/nscd-client.h>
 #include <nscd/nscd_proto.h>
-#include <resolv/res_hconf.h>
 #include <scratch_buffer.h>
 #include <inet/net-internal.h>
 
@@ -767,7 +766,6 @@ gaih_inet (const char *name, const struct gaih_service *service,
 	  nip = __nss_hosts_database;
 
 	  /* Initialize configurations.  */
-	  _res_hconf_init ();
 	  if (__res_maybe_init (&_res, 0) == -1)
 	    no_more = 1;