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-init.c | |
parent | 46cb402c6d621ef89b23fa61247faf623e8fb306 (diff) | |
download | glibc-5018f16c6205404ba3aa7298dc8a3d45fbd46bfc.tar.gz |
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-init.c')
-rw-r--r-- | hesiod/nss_hesiod/hesiod-init.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/hesiod/nss_hesiod/hesiod-init.c b/hesiod/nss_hesiod/hesiod-init.c deleted file mode 100644 index 2315040820..0000000000 --- a/hesiod/nss_hesiod/hesiod-init.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (C) 2000-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 2000. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#include <sys/cdefs.h> /* Needs to come before <hesiod.h>. */ -#include <hesiod.h> -#include <resolv.h> -#include <stddef.h> - -#include "nss_hesiod.h" - -void * -_nss_hesiod_init (void) -{ - void *context; - - if (hesiod_init (&context) == -1) - return NULL; - - /* Use the default (per-thread) resolver state. */ - __hesiod_res_set (context, &_res, NULL); - - return context; -} |