aboutsummaryrefslogtreecommitdiff
path: root/hesiod/nss_hesiod/hesiod-pwd.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-05-02 15:25:20 +0200
committerFlorian Weimer <fweimer@redhat.com>2016-05-02 15:25:20 +0200
commit5018f16c6205404ba3aa7298dc8a3d45fbd46bfc (patch)
tree5d78047ea2ee964b7874be218fa9c9e91b18f420 /hesiod/nss_hesiod/hesiod-pwd.c
parent46cb402c6d621ef89b23fa61247faf623e8fb306 (diff)
downloadglibc-5018f16c6205404ba3aa7298dc8a3d45fbd46bfc.tar
glibc-5018f16c6205404ba3aa7298dc8a3d45fbd46bfc.tar.gz
glibc-5018f16c6205404ba3aa7298dc8a3d45fbd46bfc.tar.bz2
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-pwd.c')
-rw-r--r--hesiod/nss_hesiod/hesiod-pwd.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/hesiod/nss_hesiod/hesiod-pwd.c b/hesiod/nss_hesiod/hesiod-pwd.c
index 1ddf3e3c9f..c11916781b 100644
--- a/hesiod/nss_hesiod/hesiod-pwd.c
+++ b/hesiod/nss_hesiod/hesiod-pwd.c
@@ -24,8 +24,6 @@
#include <stdlib.h>
#include <string.h>
-#include "nss_hesiod.h"
-
/* Get the declaration of the parser function. */
#define ENTNAME pwent
#define STRUCTURE passwd
@@ -56,8 +54,7 @@ lookup (const char *name, const char *type, struct passwd *pwd,
size_t len;
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);