From e6b4e2de6dd91efdcac80b79149c596de8a26b70 Mon Sep 17 00:00:00 2001 From: Florian Weimer 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. --- nscd/aicache.c | 2 -- nscd/gethstbyad_r.c | 1 - nscd/gethstbynm3_r.c | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) (limited to 'nscd') diff --git a/nscd/aicache.c b/nscd/aicache.c index 7bf4131..f1f9284 100644 --- a/nscd/aicache.c +++ b/nscd/aicache.c @@ -26,7 +26,6 @@ #include #include #include -#include #include "dbg_log.h" #include "nscd.h" @@ -102,7 +101,6 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req, nip = hosts_database; /* Initialize configurations. */ - _res_hconf_init (); if (__res_maybe_init (&_res, 0) == -1) no_more = 1; diff --git a/nscd/gethstbyad_r.c b/nscd/gethstbyad_r.c index b17f0d2..842ced2 100644 --- a/nscd/gethstbyad_r.c +++ b/nscd/gethstbyad_r.c @@ -28,7 +28,6 @@ #define EXTRA_VARIABLES , ttlp #define NEED_H_ERRNO 1 #define NEED__RES 1 -#define NEED__RES_HCONF 1 /* We are nscd, so we don't want to be talking to ourselves. */ #undef USE_NSCD diff --git a/nscd/gethstbynm3_r.c b/nscd/gethstbynm3_r.c index 41bb268..2ab75e4 100644 --- a/nscd/gethstbynm3_r.c +++ b/nscd/gethstbynm3_r.c @@ -32,7 +32,7 @@ #define ADD_VARIABLES name, af #define EXTRA_VARIABLES , ttlp, canonp #define NEED_H_ERRNO 1 -#define NEED__RES_HCONF 1 +#define NEED__RES 1 #define HANDLE_DIGITS_DOTS 1 #define HAVE_LOOKUP_BUFFER 1 -- cgit v1.1