diff options
| author | Florian Weimer <fweimer@redhat.com> | 2017-06-27 09:26:46 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2017-06-27 09:26:46 +0200 |
| commit | e6b4e2de6dd91efdcac80b79149c596de8a26b70 (patch) | |
| tree | 4ac5b1cb2d8b5df219fa0b0be3290534cbccd0e7 /nscd | |
| parent | 034e73802173a8bfa80ff21d3da45e3bbbfe8acc (diff) | |
| download | glibc-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 'nscd')
| -rw-r--r-- | nscd/aicache.c | 2 | ||||
| -rw-r--r-- | nscd/gethstbyad_r.c | 1 | ||||
| -rw-r--r-- | nscd/gethstbynm3_r.c | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/nscd/aicache.c b/nscd/aicache.c index 7bf4131979..f1f9284f6d 100644 --- a/nscd/aicache.c +++ b/nscd/aicache.c @@ -26,7 +26,6 @@ #include <unistd.h> #include <sys/mman.h> #include <resolv/resolv-internal.h> -#include <resolv/res_hconf.h> #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 b17f0d2b51..842ced2ec6 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 41bb26845d..2ab75e469e 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 |