mirror of
https://sourceware.org/git/glibc.git
synced 2026-01-06 11:51:29 +03:00
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.
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user