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 /inet | |
| 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 'inet')
| -rw-r--r-- | inet/gethstbyad_r.c | 3 | ||||
| -rw-r--r-- | inet/gethstbynm2_r.c | 4 | ||||
| -rw-r--r-- | inet/gethstbynm_r.c | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/inet/gethstbyad_r.c b/inet/gethstbyad_r.c index 88f428c1db..6b5c131050 100644 --- a/inet/gethstbyad_r.c +++ b/inet/gethstbyad_r.c @@ -18,7 +18,7 @@ #include <netdb.h> #include <string.h> - +#include <resolv/res_hconf.h> #define LOOKUP_TYPE struct hostent #define FUNCTION_NAME gethostbyaddr @@ -27,7 +27,6 @@ #define ADD_VARIABLES addr, len, type #define NEED_H_ERRNO 1 #define NEED__RES 1 -#define NEED__RES_HCONF 1 /* If the addr parameter is the IPv6 unspecified address no query must be performed. */ #define PREPROCESS \ diff --git a/inet/gethstbynm2_r.c b/inet/gethstbynm2_r.c index 5704797990..580ba6d1cf 100644 --- a/inet/gethstbynm2_r.c +++ b/inet/gethstbynm2_r.c @@ -22,7 +22,7 @@ #include <string.h> #include <arpa/inet.h> #include <netinet/in.h> - +#include <resolv/res_hconf.h> #define LOOKUP_TYPE struct hostent #define FUNCTION_NAME gethostbyname2 @@ -30,7 +30,7 @@ #define ADD_PARAMS const char *name, int af #define ADD_VARIABLES name, af #define NEED_H_ERRNO 1 -#define NEED__RES_HCONF 1 +#define NEED__RES 1 #define POSTPROCESS \ if (status == NSS_STATUS_SUCCESS) \ _res_hconf_reorder_addrs (resbuf); diff --git a/inet/gethstbynm_r.c b/inet/gethstbynm_r.c index 3758a9dde8..8f464b5ff1 100644 --- a/inet/gethstbynm_r.c +++ b/inet/gethstbynm_r.c @@ -22,7 +22,7 @@ #include <string.h> #include <arpa/inet.h> #include <netinet/in.h> - +#include <resolv/res_hconf.h> #define LOOKUP_TYPE struct hostent #define FUNCTION_NAME gethostbyname @@ -30,7 +30,7 @@ #define ADD_PARAMS const char *name #define ADD_VARIABLES name #define NEED_H_ERRNO 1 -#define NEED__RES_HCONF 1 +#define NEED__RES 1 #define POSTPROCESS \ if (status == NSS_STATUS_SUCCESS) \ _res_hconf_reorder_addrs (resbuf); |