diff options
author | Florian Weimer <fweimer@redhat.com> | 2016-05-02 15:25:20 +0200 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2016-05-02 15:25:20 +0200 |
commit | 5018f16c6205404ba3aa7298dc8a3d45fbd46bfc (patch) | |
tree | 5d78047ea2ee964b7874be218fa9c9e91b18f420 /hesiod/nss_hesiod/hesiod-service.c | |
parent | 46cb402c6d621ef89b23fa61247faf623e8fb306 (diff) | |
download | glibc-5018f16c6205404ba3aa7298dc8a3d45fbd46bfc.tar.gz glibc-5018f16c6205404ba3aa7298dc8a3d45fbd46bfc.tar.xz glibc-5018f16c6205404ba3aa7298dc8a3d45fbd46bfc.zip |
hesiod: Always use thread-local resolver state [BZ #19573]
The Hesiod implementation imported into glibc was enhanced to support caller-supplied resolver states. But its only consumer is nss_hesiod, and it supplies the thread-local resolver state. Therefore, this commit changes the Hesiod implementation to use the thread-local resolver state (_res) directly. This fixes bug 19573 because the Hesiod implementation no longer has to initialize and free any resolver state. To avoid any risk of interposition of ABI-incompatible Hesiod function implementations, this commit marks the Hesiod functions as hidden. (They were already hidden using a linker version script.)
Diffstat (limited to 'hesiod/nss_hesiod/hesiod-service.c')
-rw-r--r-- | hesiod/nss_hesiod/hesiod-service.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/hesiod/nss_hesiod/hesiod-service.c b/hesiod/nss_hesiod/hesiod-service.c index 756345f04e..2df9cbb0c0 100644 --- a/hesiod/nss_hesiod/hesiod-service.c +++ b/hesiod/nss_hesiod/hesiod-service.c @@ -25,8 +25,6 @@ #include <stdlib.h> #include <string.h> -#include "nss_hesiod.h" - /* Hesiod uses a format for service entries that differs from the traditional format. We therefore declare our own parser. */ @@ -69,8 +67,7 @@ lookup (const char *name, const char *type, const char *protocol, int found; int olderr = errno; - context = _nss_hesiod_init (); - if (context == NULL) + if (hesiod_init (&context) < 0) return NSS_STATUS_UNAVAIL; list = hesiod_resolve (context, name, type); |