resolv: Call _res_hconf_init from __res_vinit

[thirdparty/glibc.git] / nscd / getpwnam_r.c

diff --git a/nscd/getpwnam_r.c b/nscd/getpwnam_r.c
index c92209a0cf5f52d57d0d5c1849113d4d039941de..9af95b6c01cbaf3677455631b2b813de384d17cf 100644 (file)
--- a/nscd/getpwnam_r.c
+++ b/nscd/getpwnam_r.c
@@ -1,10 +1,11 @@
-/* Copyright (C) 1996, 1997, 1998, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2017 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,8 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <pwd.h>
 
@@ -25,4 +25,7 @@
 #define ADD_VARIABLES  name
 #define BUFLEN         NSS_BUFLEN_PASSWD
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef USE_NSCD
+
 #include <nss/getXXbyYY_r.c>