AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 10:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolv: Call _res_hconf_init from __res_vinit

Browse Source 
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:
Florian Weimer 2017-06-27 09:26:46 +02:00
parent 034e738021
commit e6b4e2de6d
11 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -1,3 +1,22 @@
2017-06-27 Florian Weimer <fweimer@redhat.com>
Call _res_hconf_init from __res_vinit.
* inet/gethstbyad_r.c (NEED__RES_HCONF): Remove.
* inet/gethstbynm2_r.c (NEED__RES_HCONF): Likewise.
(NEED__RES): Define.
* inet/gethstbynm_r.c (NEED__RES_HCONF): Remove.
(NEED__RES): Define.
* nscd/aicache.c (addhstaiX): Remove call to _res_hconf_init.
* nscd/gethstbyad_r.c (NEED__RES_HCONF): Remove.
* nscd/gethstbynm3_r.c (NEED__RES_HCONF): Likewise.
(NEED__RES): Define.
* nss/getXXbyYY_r.c (REENTRANT_NAME): Remove call to
_res_hconf_init.
* resolv/res_hconf.h (_res_hconf_init): Declare as hidden.
* resolv/res_init.c (__res_vinit): Call _res_hconf_init.
* sysdeps/posix/getaddrinfo.c (gaih_inet): Remove call to
_res_hconf_init.
2017-06-26 Joseph Myers <joseph@codesourcery.com>
* sysdeps/ia64/Implies: Add ieee754/float128.

3
inet/gethstbyad_r.c
View File

@ -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 \

4
inet/gethstbynm2_r.c
View File

@ -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);

4
inet/gethstbynm_r.c
View File

@ -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);

2
nscd/aicache.c
View File

@ -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;

1
nscd/gethstbyad_r.c
View File

@ -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

2
nscd/gethstbynm3_r.c
View File

@ -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

6
nss/getXXbyYY_r.c
View File

@ -25,9 +25,6 @@
#ifdef USE_NSCD
# include <nscd/nscd_proto.h>
#endif
#ifdef NEED__RES_HCONF
# include <resolv/res_hconf.h>
#endif
#ifdef NEED__RES
# include <resolv.h>
#endif
@ -273,9 +270,6 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
return errno;
}
#endif /* need _res */
#ifdef NEED__RES_HCONF
_res_hconf_init ();
#endif /* need _res_hconf */
void *tmp_ptr = fct.l;
#ifdef PTR_MANGLE

2
resolv/res_hconf.h
View File

@ -46,7 +46,7 @@ struct hconf
};
extern struct hconf _res_hconf;
extern void _res_hconf_init (void);
extern void _res_hconf_init (void) attribute_hidden;
extern void _res_hconf_trim_domain (char *domain);
extern void _res_hconf_trim_domains (struct hostent *hp);
extern void _res_hconf_reorder_addrs (struct hostent *hp);

4
resolv/res_init.c
View File

@ -85,6 +85,7 @@
#include <ctype.h>
#include <netdb.h>
#include <resolv/resolv-internal.h>
#include <res_hconf.h>
#include <stdio.h>
#include <stdio_ext.h>
#include <stdlib.h>
@ -430,6 +431,9 @@ res_vinit_1 (res_state statp, bool preinit, FILE *fp, char **buffer)
int
__res_vinit (res_state statp, int preinit)
{
/* Ensure that /etc/hosts.conf has been loaded (once). */
_res_hconf_init ();
FILE *fp = fopen (_PATH_RESCONF, "rce");
if (fp == NULL)
switch (errno)

2
sysdeps/posix/getaddrinfo.c
View File

@ -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;