From ed2ced8ae324a8a89a76ff3fc3971226b0107d3e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 10 Nov 2004 07:54:40 +0000 Subject: Update. 2004-11-10 Jakub Jelinek * Makefile (tests): Add tst-exit3. * tst-exit3.c: New test. --- nscd/nscd_getai.c | 14 ++++---------- nscd/nscd_getgr_r.c | 13 +++++++++---- nscd/nscd_gethst_r.c | 15 ++++++++++----- nscd/nscd_initgroups.c | 13 +++---------- 4 files changed, 26 insertions(+), 29 deletions(-) (limited to 'nscd') diff --git a/nscd/nscd_getai.c b/nscd/nscd_getai.c index 390b981..f0b2082 100644 --- a/nscd/nscd_getai.c +++ b/nscd/nscd_getai.c @@ -33,15 +33,8 @@ extern int __nss_not_use_nscd_hosts; -libc_locked_map_ptr (map_handle); -/* Note that we only free the structure if necessary. The memory - mapping is not removed since it is not visible to the malloc - handling. */ -libc_freeres_fn (ai_map_free) -{ - if (map_handle.mapped != NO_MAPPING) - free (map_handle.mapped); -} +/* We use the mapping from nscd_gethst. */ +libc_locked_map_ptr (extern, __hst_map_handle); int @@ -53,7 +46,8 @@ __nscd_getai (const char *key, struct nscd_ai_result **result, int *h_errnop) /* If the mapping is available, try to search there instead of communicating with the nscd. */ struct mapped_database *mapped; - mapped = __nscd_get_map_ref (GETFDHST, "hosts", &map_handle, &gc_cycle); + mapped = __nscd_get_map_ref (GETFDHST, "hosts", &__hst_map_handle, + &gc_cycle); retry:; const ai_response_header *ai_resp = NULL; diff --git a/nscd/nscd_getgr_r.c b/nscd/nscd_getgr_r.c index fc10d3e..282912d 100644 --- a/nscd/nscd_getgr_r.c +++ b/nscd/nscd_getgr_r.c @@ -67,14 +67,18 @@ __nscd_getgrgid_r (gid_t gid, struct group *resultbuf, char *buffer, } -libc_locked_map_ptr (map_handle); +libc_locked_map_ptr (,__gr_map_handle); /* Note that we only free the structure if necessary. The memory mapping is not removed since it is not visible to the malloc handling. */ libc_freeres_fn (gr_map_free) { - if (map_handle.mapped != NO_MAPPING) - free (map_handle.mapped); + if (__gr_map_handle.mapped != NO_MAPPING) + { + void *p = __gr_map_handle.mapped; + __gr_map_handle.mapped = NO_MAPPING; + free (p); + } } @@ -91,7 +95,8 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type, /* If the mapping is available, try to search there instead of communicating with the nscd. */ struct mapped_database *mapped = __nscd_get_map_ref (GETFDGR, "group", - &map_handle, &gc_cycle); + &__gr_map_handle, + &gc_cycle); retry:; const gr_response_header *gr_resp = NULL; const char *gr_name = NULL; diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c index 64d02fe..5d9d569 100644 --- a/nscd/nscd_gethst_r.c +++ b/nscd/nscd_gethst_r.c @@ -87,14 +87,18 @@ __nscd_gethostbyaddr_r (const void *addr, socklen_t len, int type, } -libc_locked_map_ptr (map_handle); +libc_locked_map_ptr (, __hst_map_handle); /* Note that we only free the structure if necessary. The memory mapping is not removed since it is not visible to the malloc handling. */ -libc_freeres_fn (gr_map_free) +libc_freeres_fn (hst_map_free) { - if (map_handle.mapped != NO_MAPPING) - free (map_handle.mapped); + if (__hst_map_handle.mapped != NO_MAPPING) + { + void *p = __hst_map_handle.mapped; + __hst_map_handle.mapped = NO_MAPPING; + free (p); + } } @@ -110,7 +114,8 @@ nscd_gethst_r (const char *key, size_t keylen, request_type type, /* If the mapping is available, try to search there instead of communicating with the nscd. */ struct mapped_database *mapped; - mapped = __nscd_get_map_ref (GETFDHST, "hosts", &map_handle, &gc_cycle); + mapped = __nscd_get_map_ref (GETFDHST, "hosts", &__hst_map_handle, + &gc_cycle); retry:; const hst_response_header *hst_resp = NULL; diff --git a/nscd/nscd_initgroups.c b/nscd/nscd_initgroups.c index ce44f65..2ea9e7f 100644 --- a/nscd/nscd_initgroups.c +++ b/nscd/nscd_initgroups.c @@ -29,15 +29,8 @@ #include "nscd_proto.h" -libc_locked_map_ptr (map_handle); -/* Note that we only free the structure if necessary. The memory - mapping is not removed since it is not visible to the malloc - handling. */ -libc_freeres_fn (gr_map_free) -{ - if (map_handle.mapped != NO_MAPPING) - free (map_handle.mapped); -} +/* We use the same mapping as in nscd_getgr. */ +libc_locked_map_ptr (extern, __gr_map_handle); int @@ -50,7 +43,7 @@ __nscd_getgrouplist (const char *user, gid_t group, long int *size, /* If the mapping is available, try to search there instead of communicating with the nscd. */ struct mapped_database *mapped; - mapped = __nscd_get_map_ref (GETFDGR, "group", &map_handle, &gc_cycle); + mapped = __nscd_get_map_ref (GETFDGR, "group", &__gr_map_handle, &gc_cycle); retry:; const initgr_response_header *initgr_resp = NULL; -- cgit v1.1