Fix shadow, gshadow, networks, protocols, rpc, aliases, and nscd routines for USE_NSC...

diff --git a/ChangeLog b/ChangeLog
index d0fa3b050faf1361d40dd4121eb0ab84a723440e..049decdb20ebdd72dbc0a48034858f6507ab33e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 1242deecbbe4ec98463550090239bf585bbc29e7..e7998e9ec34b6acbdb7e7e92ea57664ea47f4238 100644 (file)
--- 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 7b1df5357c426eb3993f140e9f52067558bf8569..546251ca76025e0c55c29a68de802d4110bf2090 100644 (file)
--- 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 203c21076bc9209fa9a27bf7caef2b4bb0056327..2ee20a1c37b81d5e72fc6d7b5f5957b7eeb1166d 100644 (file)
--- 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 9e00f6e66d674b498f895fb04efa98f5f8baac02..a18f3df36bea44e7e0e541f9f32a0e35c1741fc4 100644 (file)
--- 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 12173db98ed4c98a583a445a573f1cac526f6337..b11ebd67724785972d4736154af32d19ce95590a 100644 (file)
--- 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 702d31d0c3d327773b6f46c87797488abef2ac7e..56a872822e340a1869c4b978a92f4874d9c8febb 100644 (file)
--- 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 e744c906d0452b0158ad99a961d1abe061ab4a27..4d6ef74d61615ad87080858812568415093d610a 100644 (file)
--- 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 5b21bec5765addea00c252e83b25a5771671080f..5333e75324254762682b5435b28814a613b15132 100644 (file)
--- 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 4d0aab4cb5b7c199ef18fdf5230bb255dd3add08..02f2c98ea87b185010a56131e6d7fa222f6ea9a1 100644 (file)
--- 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 9c1b200edea76537b89ede617072a3319340ebb2..283700236a6e1ef06da7497a2d17fc8b5216740d 100644 (file)
--- 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 cf9a2d17c9c11dbae4a492e5c55bf1a87ce11195..1e53c0fd1a119bdddca58e19a9bea17724d91f63 100644 (file)
--- 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 1cf5bfac944dfac5af18342b994e38d4e0f4e493..4aaf5e635d6b01afbd522d41213b84c57a229874 100644 (file)
--- 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 09f1158aeb367efa12bebe16b5ba33e4116d34af..e449fa207741c04286081e134d7905197d08163d 100644 (file)
--- 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 e46f441b9af87a6713ed3082afb95a344e4bb33b..ef7fb9f1d1d0fa23356b6d46e1f2df29fe51166d 100644 (file)
--- 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 3bee3d5b16014b0175768a3c88cbae33ca30ba91..99ae01452ef652648853c07c5b3b9fc0cae95cd9 100644 (file)
--- 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 0d5f31e477b1b695448d008e25cb384769b48c3d..e3881b8ae9b1e9e40cac828613e17e88015a4d42 100644 (file)
--- 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 ef54c49985865f982d2083ade7545d2bcebbf8ce..2cced62c17a8667afdd2082b7d84d69668317307 100644 (file)
--- 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 9bc0b16152fa1e92f7bdbc2ccdc29e2099942769..a3284f265127a40ad1c1866feebbba6de0d8c1a6 100644 (file)
--- 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 ea5cb82ec027997bf364c76b4207a26db78c4e3a..f7ac9a78aaa5e63191352efea91e73829a78c8ae 100644 (file)
--- 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 b216276824b5d9590b5d9ba43f65af64698c97cd..371243e7754007be62ec9b6e90b00756e4a2af8d 100644 (file)
--- 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 a433bd70fac8dc5d6d73bb879c2174944141bff9..e72d9acc9d799da25fad69354d90c29df7cb8cb8 100644 (file)
--- 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 45a0d88aaf80491884f02cf48a68cd9a104066a9..ff8629d8071bf1a9725a04fec2a3e82d450e71e8 100644 (file)
--- 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 0f0e0d96e8276b673ff6901c1d58a22c95991987..0546ece2a13d0a17db65b2bbddf010fec384b204 100644 (file)
--- 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 3109c3b208976ea7ab7335fda93cc7d011e66147..d6e5f2321215e37bf4962c89ad90726ad17dbe1a 100644 (file)
--- 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 05d3a0a8f6268d5bd43eb64ccc85cbfcc4fc6b6d..b58fa641cb0e163d02ee4a09fdbd748b9d33d6c3 100644 (file)
--- 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 ff2bf7584913775079534bf7a4f6d768d7862f1e..b0c8172b0d7edc76204901cee687cae987c1aeeb 100644 (file)
--- 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 1c6527cf0ce89daf2ed9339855863107b6c854fb..060933293838c4ee0de506ec7b2d25da6a1e5fbe 100644 (file)
--- 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 09b6cbf1cb024c6bdb2182ebe7828587a685953d..5b433321b5c59fbd0c52abb7f2c102e803a12514 100644 (file)
--- 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 53e572d13a567e4940a4bccedc9a1c9ef772a017..aff6fcc5323115295819ac282046e135a3cc6cb4 100644 (file)
--- 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 bb9fab98e809a217bfe9886dfcfe2ef0b77acdcf..c0988b862da3ef038ae42029023846b0602661d8 100644 (file)
--- 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 86038ba7711c3d4d9b00d8268105d3b36fa8a481..a7d25548a8ef3f36c157c05f37414f33422f63ff 100644 (file)
--- 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 7b6c5b31e3e4ee9474b6e8f50657a14974b3fa1a..06e57044bde45de6f9baec5a696bde53333f5aec 100644 (file)
--- 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 f3a01c64fe483c8e61b735648c316927cbdf69d1..ce8e2dfefa58d72cdebe41da34ce19d811a253c1 100644 (file)
--- 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 c8b374415306b3213fee81531d61b53184134551..a1c25c705fd2f2ed571c0e5b65ddd253a024207d 100644 (file)
--- 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 cb73426d8a9fe08bec88efb4ca59bf40859c9eb6..3c05771f1fe9447a62c4820d21109e158ce574b1 100644 (file)
--- 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 50dfcd332d2b73e025cae94f5c99cbef3dba6f3e..d2a1db67c9806d46036e5c35a5ca7c43e792714e 100644 (file)
--- 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 6292781dc3ec234a425045d1c6357066564ebe7f..27cb5e85154384d39a018c7764f2783c10782c41 100644 (file)
--- 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 beb057064526d811fceb7f650ff250d1a6f727f7..59ed79daa7a173f094a56ab612a5a049731c1101 100644 (file)
--- 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 99c04f9f4670d933ef8fdae49c946ae5dffbb075..e1b652469c7db57177aa04efbc9089ec1c4c91bb 100644 (file)
--- 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"