aboutsummaryrefslogtreecommitdiff
path: root/nscd
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-08-22 16:06:53 -0700
committerRoland McGrath <roland@hack.frob.com>2012-08-22 16:06:53 -0700
commitf04e213208e4d40ccd562885ab511732d0bd033e (patch)
treebc12193719f127a52459602e6c1e63ab7ab6299f /nscd
parenteaeffd07f7bbf57d33fcea5c9f1c9a669a436023 (diff)
downloadglibc-f04e213208e4d40ccd562885ab511732d0bd033e.zip
glibc-f04e213208e4d40ccd562885ab511732d0bd033e.tar.gz
glibc-f04e213208e4d40ccd562885ab511732d0bd033e.tar.bz2
Fix shadow, gshadow, networks, protocols, rpc, aliases, and nscd routines for USE_NSCD case.
Diffstat (limited to 'nscd')
-rw-r--r--nscd/gai.c3
-rw-r--r--nscd/getgrgid_r.c5
-rw-r--r--nscd/getgrnam_r.c5
-rw-r--r--nscd/gethstbyad_r.c5
-rw-r--r--nscd/gethstbynm3_r.c5
-rw-r--r--nscd/getpwnam_r.c5
-rw-r--r--nscd/getpwuid_r.c5
-rw-r--r--nscd/getsrvbynm_r.c5
-rw-r--r--nscd/getsrvbypt_r.c5
9 files changed, 35 insertions, 8 deletions
diff --git a/nscd/gai.c b/nscd/gai.c
index 1c6527c..0609332 100644
--- a/nscd/gai.c
+++ b/nscd/gai.c
@@ -32,6 +32,9 @@
/* nscd uses 1MB or 2MB thread stacks. */
#define __libc_use_alloca(size) (size <= __MAX_ALLOCA_CUTOFF)
+/* We are nscd, so we don't want to be talking to ourselves. */
+#undef USE_NSCD
+
#include <getaddrinfo.c>
/* Support code. */
diff --git a/nscd/getgrgid_r.c b/nscd/getgrgid_r.c
index 09b6cbf..5b43332 100644
--- a/nscd/getgrgid_r.c
+++ b/nscd/getgrgid_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -25,4 +25,7 @@
#define ADD_VARIABLES gid
#define BUFLEN NSS_BUFLEN_GROUP
+/* We are nscd, so we don't want to be talking to ourselves. */
+#undef USE_NSCD
+
#include <nss/getXXbyYY_r.c>
diff --git a/nscd/getgrnam_r.c b/nscd/getgrnam_r.c
index 53e572d..aff6fcc 100644
--- a/nscd/getgrnam_r.c
+++ b/nscd/getgrnam_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -24,4 +24,7 @@
#define ADD_PARAMS const char *name
#define ADD_VARIABLES name
+/* We are nscd, so we don't want to be talking to ourselves. */
+#undef USE_NSCD
+
#include <nss/getXXbyYY_r.c>
diff --git a/nscd/gethstbyad_r.c b/nscd/gethstbyad_r.c
index bb9fab9..c0988b8 100644
--- a/nscd/gethstbyad_r.c
+++ b/nscd/gethstbyad_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2000, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -30,6 +30,9 @@
#define NEED__RES 1
#define NEED__RES_HCONF 1
+/* We are nscd, so we don't want to be talking to ourselves. */
+#undef USE_NSCD
+
#include "../nss/getXXbyYY_r.c"
diff --git a/nscd/gethstbynm3_r.c b/nscd/gethstbynm3_r.c
index 86038ba..a7d2554 100644
--- a/nscd/gethstbynm3_r.c
+++ b/nscd/gethstbynm3_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-1998, 2000, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -40,6 +40,9 @@
#define __inet_aton inet_aton
+/* We are nscd, so we don't want to be talking to ourselves. */
+#undef USE_NSCD
+
#include "../nss/getXXbyYY_r.c"
diff --git a/nscd/getpwnam_r.c b/nscd/getpwnam_r.c
index 7b6c5b3..06e5704 100644
--- a/nscd/getpwnam_r.c
+++ b/nscd/getpwnam_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -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>
diff --git a/nscd/getpwuid_r.c b/nscd/getpwuid_r.c
index f3a01c6..ce8e2df 100644
--- a/nscd/getpwuid_r.c
+++ b/nscd/getpwuid_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -25,4 +25,7 @@
#define ADD_VARIABLES uid
#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>
diff --git a/nscd/getsrvbynm_r.c b/nscd/getsrvbynm_r.c
index c8b3744..a1c25c7 100644
--- a/nscd/getsrvbynm_r.c
+++ b/nscd/getsrvbynm_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2002, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -24,4 +24,7 @@
#define ADD_PARAMS const char *name, const char *proto
#define ADD_VARIABLES name, proto
+/* We are nscd, so we don't want to be talking to ourselves. */
+#undef USE_NSCD
+
#include "../nss/getXXbyYY_r.c"
diff --git a/nscd/getsrvbypt_r.c b/nscd/getsrvbypt_r.c
index cb73426..3c05771 100644
--- a/nscd/getsrvbypt_r.c
+++ b/nscd/getsrvbypt_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2002, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -24,4 +24,7 @@
#define ADD_PARAMS int port, const char *proto
#define ADD_VARIABLES port, proto
+/* We are nscd, so we don't want to be talking to ourselves. */
+#undef USE_NSCD
+
#include "../nss/getXXbyYY_r.c"