diff options
| author | Roland McGrath <roland@hack.frob.com> | 2012-08-22 16:06:53 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-08-22 16:06:53 -0700 |
| commit | f04e213208e4d40ccd562885ab511732d0bd033e (patch) | |
| tree | bc12193719f127a52459602e6c1e63ab7ab6299f | |
| parent | eaeffd07f7bbf57d33fcea5c9f1c9a669a436023 (diff) | |
Fix shadow, gshadow, networks, protocols, rpc, aliases, and nscd routines for USE_NSCD case.
40 files changed, 195 insertions, 38 deletions
@@ -1,5 +1,45 @@ 2012-08-22 Roland McGrath <roland@hack.frob.com> + * shadow/getspent.c: #undef USE_NSCD before #include that gets the code. + * shadow/getspent_r.c: Likewise. + * shadow/getspnam.c: Likewise. + * shadow/getspnam_r.c: Likewise. + * gshadow/getsgent.c: Likewise. + * gshadow/getsgent_r.c: Likewise. + * gshadow/getsgnam.c: Likewise. + * gshadow/getsgnam_r.c: Likewise. + * inet/getnetbyad.c: Likewise. + * inet/getnetbyad_r.c: Likewise. + * inet/getnetbynm.c: Likewise. + * inet/getnetbynm_r.c: Likewise. + * inet/getnetent.c: Likewise. + * inet/getnetent_r.c: Likewise. + * inet/getproto.c: Likewise. + * inet/getproto_r.c: Likewise. + * inet/getprtent.c: Likewise. + * inet/getprtent_r.c: Likewise. + * inet/getprtname.c: Likewise. + * inet/getprtname_r.c: Likewise. + * inet/getrpcbyname.c: Likewise. + * inet/getrpcbyname_r.c: Likewise. + * inet/getrpcbynumber.c: Likewise. + * inet/getrpcbynumber_r.c: Likewise. + * inet/getrpcent.c: Likewise. + * inet/getrpcent_r.c: Likewise. + * inet/getaliasent.c: Likewise. + * inet/getaliasent_r.c: Likewise. + * inet/getaliasname.c: Likewise. + * inet/getaliasname_r.c: Likewise. + * nscd/getgrgid_r.c: Likewise. + * nscd/getgrnam_r.c: Likewise. + * nscd/gethstbyad_r.c: Likewise. + * nscd/gethstbynm3_r.c: Likewise. + * nscd/getpwnam_r.c: Likewise. + * nscd/getpwuid_r.c: Likewise. + * nscd/getsrvbynm_r.c: Likewise. + * nscd/getsrvbypt_r.c: Likewise. + * nscd/gai.c: Likewise. + * configure.in (build_nscd): New substituted variable, set by --disable-build-nscd and defaults to $use_nscd. * configure: Regenerated. diff --git a/gshadow/getsgent.c b/gshadow/getsgent.c index 1242deecbb..e7998e9ec3 100644 --- a/gshadow/getsgent.c +++ b/gshadow/getsgent.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009 Free Software Foundation, Inc. +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2009. @@ -26,4 +26,7 @@ #define DATABASE_NAME gshadow #define BUFLEN 1024 +/* There is no nscd support for the shadow file. */ +#undef USE_NSCD + #include "../nss/getXXent.c" diff --git a/gshadow/getsgent_r.c b/gshadow/getsgent_r.c index 7b1df5357c..546251ca76 100644 --- a/gshadow/getsgent_r.c +++ b/gshadow/getsgent_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009 Free Software Foundation, Inc. +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2009. @@ -27,4 +27,7 @@ #define BUFLEN 1024 #define NO_COMPAT_NEEDED 1 +/* There is no nscd support for the shadow file. */ +#undef USE_NSCD + #include "../nss/getXXent_r.c" diff --git a/gshadow/getsgnam.c b/gshadow/getsgnam.c index 203c21076b..2ee20a1c37 100644 --- a/gshadow/getsgnam.c +++ b/gshadow/getsgnam.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009 Free Software Foundation, Inc. +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2009. @@ -26,4 +26,7 @@ #define ADD_VARIABLES name #define BUFLEN 1024 +/* There is no nscd support for the shadow file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY.c" diff --git a/gshadow/getsgnam_r.c b/gshadow/getsgnam_r.c index 9e00f6e66d..a18f3df36b 100644 --- a/gshadow/getsgnam_r.c +++ b/gshadow/getsgnam_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009 Free Software Foundation, Inc. +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2009. @@ -27,4 +27,7 @@ #define BUFLEN 1024 #define NO_COMPAT_NEEDED 1 +/* There is no nscd support for the shadow file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY_r.c" diff --git a/inet/getaliasent.c b/inet/getaliasent.c index 12173db98e..b11ebd6772 100644 --- a/inet/getaliasent.c +++ b/inet/getaliasent.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. +/* Copyright (C) 1996-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,4 +22,7 @@ #define GETFUNC_NAME getaliasent #define BUFLEN 1024 +/* There is no nscd support for the aliases file. */ +#undef USE_NSCD + #include "../nss/getXXent.c" diff --git a/inet/getaliasent_r.c b/inet/getaliasent_r.c index 702d31d0c3..56a872822e 100644 --- a/inet/getaliasent_r.c +++ b/inet/getaliasent_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 2002 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 ENDFUNC_NAME endaliasent #define DATABASE_NAME aliases +/* There is no nscd support for the aliases file. */ +#undef USE_NSCD + #include "../nss/getXXent_r.c" diff --git a/inet/getaliasname.c b/inet/getaliasname.c index e744c906d0..4d6ef74d61 100644 --- a/inet/getaliasname.c +++ b/inet/getaliasname.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996 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. @@ -26,4 +26,7 @@ #define ADD_VARIABLES name #define BUFLEN 1024 +/* There is no nscd support for the aliases file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY.c" diff --git a/inet/getaliasname_r.c b/inet/getaliasname_r.c index 5b21bec576..5333e75324 100644 --- a/inet/getaliasname_r.c +++ b/inet/getaliasname_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 2002 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_PARAMS const char *name #define ADD_VARIABLES name +/* There is no nscd support for the aliases file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY_r.c" diff --git a/inet/getnetbyad.c b/inet/getnetbyad.c index 4d0aab4cb5..02f2c98ea8 100644 --- a/inet/getnetbyad.c +++ b/inet/getnetbyad.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 2000 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. @@ -28,4 +28,7 @@ #define BUFLEN 1024 #define NEED_H_ERRNO 1 +/* There is no nscd support for the networks file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY.c" diff --git a/inet/getnetbyad_r.c b/inet/getnetbyad_r.c index 9c1b200ede..283700236a 100644 --- a/inet/getnetbyad_r.c +++ b/inet/getnetbyad_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 2000, 2002 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. @@ -28,4 +28,7 @@ #define NEED__RES 1 #define NEED_H_ERRNO 1 +/* There is no nscd support for the networks file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY_r.c" diff --git a/inet/getnetbynm.c b/inet/getnetbynm.c index cf9a2d17c9..1e53c0fd1a 100644 --- a/inet/getnetbynm.c +++ b/inet/getnetbynm.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 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. @@ -27,4 +27,7 @@ #define BUFLEN 1024 #define NEED_H_ERRNO 1 +/* There is no nscd support for the networks file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY.c" diff --git a/inet/getnetbynm_r.c b/inet/getnetbynm_r.c index 1cf5bfac94..4aaf5e635d 100644 --- a/inet/getnetbynm_r.c +++ b/inet/getnetbynm_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 2002 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. @@ -27,4 +27,7 @@ #define NEED__RES 1 #define NEED_H_ERRNO 1 +/* There is no nscd support for the networks file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY_r.c" diff --git a/inet/getnetent.c b/inet/getnetent.c index 09f1158aeb..e449fa2077 100644 --- a/inet/getnetent.c +++ b/inet/getnetent.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1996-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -23,4 +23,7 @@ #define BUFLEN 1024 #define NEED_H_ERRNO 1 +/* There is no nscd support for the networks file. */ +#undef USE_NSCD + #include "../nss/getXXent.c" diff --git a/inet/getnetent_r.c b/inet/getnetent_r.c index e46f441b9a..ef7fb9f1d1 100644 --- a/inet/getnetent_r.c +++ b/inet/getnetent_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1996-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -28,4 +28,7 @@ #define NEED__RES 1 #define NEED_H_ERRNO 1 +/* There is no nscd support for the networks file. */ +#undef USE_NSCD + #include "../nss/getXXent_r.c" diff --git a/inet/getproto.c b/inet/getproto.c index 3bee3d5b16..99ae01452e 100644 --- a/inet/getproto.c +++ b/inet/getproto.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 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. @@ -26,4 +26,7 @@ #define ADD_VARIABLES proto #define BUFLEN 1024 +/* There is no nscd support for the protocols file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY.c" diff --git a/inet/getproto_r.c b/inet/getproto_r.c index 0d5f31e477..e3881b8ae9 100644 --- a/inet/getproto_r.c +++ b/inet/getproto_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 2002 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_PARAMS int proto #define ADD_VARIABLES proto +/* There is no nscd support for the protocols file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY_r.c" diff --git a/inet/getprtent.c b/inet/getprtent.c index ef54c49985..2cced62c17 100644 --- a/inet/getprtent.c +++ b/inet/getprtent.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1996-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,4 +22,7 @@ #define GETFUNC_NAME getprotoent #define BUFLEN 1024 +/* There is no nscd support for the protocols file. */ +#undef USE_NSCD + #include "../nss/getXXent.c" diff --git a/inet/getprtent_r.c b/inet/getprtent_r.c index 9bc0b16152..a3284f2651 100644 --- a/inet/getprtent_r.c +++ b/inet/getprtent_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1996-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -26,4 +26,7 @@ #define STAYOPEN int stayopen #define STAYOPEN_VAR stayopen +/* There is no nscd support for the protocols file. */ +#undef USE_NSCD + #include "../nss/getXXent_r.c" diff --git a/inet/getprtname.c b/inet/getprtname.c index ea5cb82ec0..f7ac9a78aa 100644 --- a/inet/getprtname.c +++ b/inet/getprtname.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 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. @@ -26,4 +26,7 @@ #define ADD_VARIABLES name #define BUFLEN 1024 +/* There is no nscd support for the protocols file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY.c" diff --git a/inet/getprtname_r.c b/inet/getprtname_r.c index b216276824..371243e775 100644 --- a/inet/getprtname_r.c +++ b/inet/getprtname_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 2002 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_PARAMS const char *name #define ADD_VARIABLES name +/* There is no nscd support for the protocols file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY_r.c" diff --git a/inet/getrpcbyname.c b/inet/getrpcbyname.c index a433bd70fa..e72d9acc9d 100644 --- a/inet/getrpcbyname.c +++ b/inet/getrpcbyname.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 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. @@ -26,4 +26,7 @@ #define ADD_VARIABLES name #define BUFLEN 1024 +/* There is no nscd support for the rpc file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY.c" diff --git a/inet/getrpcbyname_r.c b/inet/getrpcbyname_r.c index 45a0d88aaf..ff8629d807 100644 --- a/inet/getrpcbyname_r.c +++ b/inet/getrpcbyname_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 2002 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_PARAMS const char *name #define ADD_VARIABLES name +/* There is no nscd support for the rpc file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY_r.c" diff --git a/inet/getrpcbynumber.c b/inet/getrpcbynumber.c index 0f0e0d96e8..0546ece2a1 100644 --- a/inet/getrpcbynumber.c +++ b/inet/getrpcbynumber.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 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. @@ -26,4 +26,7 @@ #define ADD_VARIABLES number #define BUFLEN 1024 +/* There is no nscd support for the rpc file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY.c" diff --git a/inet/getrpcbynumber_r.c b/inet/getrpcbynumber_r.c index 3109c3b208..d6e5f23212 100644 --- a/inet/getrpcbynumber_r.c +++ b/inet/getrpcbynumber_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 2002 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_PARAMS int number #define ADD_VARIABLES number +/* There is no nscd support for the rpc file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY_r.c" diff --git a/inet/getrpcent.c b/inet/getrpcent.c index 05d3a0a8f6..b58fa641cb 100644 --- a/inet/getrpcent.c +++ b/inet/getrpcent.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1996-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,4 +22,7 @@ #define GETFUNC_NAME getrpcent #define BUFLEN 1024 +/* There is no nscd support for the rpc file. */ +#undef USE_NSCD + #include "../nss/getXXent.c" diff --git a/inet/getrpcent_r.c b/inet/getrpcent_r.c index ff2bf75849..b0c8172b0d 100644 --- a/inet/getrpcent_r.c +++ b/inet/getrpcent_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1996-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -26,4 +26,7 @@ #define STAYOPEN int stayopen #define STAYOPEN_VAR stayopen +/* There is no nscd support for the rpc file. */ +#undef USE_NSCD + #include "../nss/getXXent_r.c" diff --git a/nscd/gai.c b/nscd/gai.c index 1c6527cf0c..0609332938 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 09b6cbf1cb..5b433321b5 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 53e572d13a..aff6fcc532 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 bb9fab98e8..c0988b862d 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 86038ba771..a7d25548a8 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 7b6c5b31e3..06e57044bd 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 f3a01c64fe..ce8e2dfefa 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 c8b3744153..a1c25c705f 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 cb73426d8a..3c05771f1f 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" diff --git a/shadow/getspent.c b/shadow/getspent.c index 50dfcd332d..d2a1db67c9 100644 --- a/shadow/getspent.c +++ b/shadow/getspent.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 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. @@ -26,4 +26,7 @@ #define DATABASE_NAME shadow #define BUFLEN 1024 +/* There is no nscd support for the shadow file. */ +#undef USE_NSCD + #include "../nss/getXXent.c" diff --git a/shadow/getspent_r.c b/shadow/getspent_r.c index 6292781dc3..27cb5e8515 100644 --- a/shadow/getspent_r.c +++ b/shadow/getspent_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 2002 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. @@ -26,4 +26,7 @@ #define DATABASE_NAME shadow #define BUFLEN 1024 +/* There is no nscd support for the shadow file. */ +#undef USE_NSCD + #include "../nss/getXXent_r.c" diff --git a/shadow/getspnam.c b/shadow/getspnam.c index beb0570645..59ed79daa7 100644 --- a/shadow/getspnam.c +++ b/shadow/getspnam.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 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. @@ -26,4 +26,7 @@ #define ADD_VARIABLES name #define BUFLEN 1024 +/* There is no nscd support for the shadow file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY.c" diff --git a/shadow/getspnam_r.c b/shadow/getspnam_r.c index 99c04f9f46..e1b652469c 100644 --- a/shadow/getspnam_r.c +++ b/shadow/getspnam_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 2002 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. @@ -26,4 +26,7 @@ #define ADD_VARIABLES name #define BUFLEN 1024 +/* There is no nscd support for the shadow file. */ +#undef USE_NSCD + #include "../nss/getXXbyYY_r.c" |