This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
Re: roland/build-nscd, roland/disable-nscd merged

From: Roland McGrath <roland at hack dot frob dot com>
To: "Joseph S. Myers" <joseph at codesourcery dot com>
Cc: <libc-alpha at sourceware dot org>
Date: Wed, 22 Aug 2012 16:11:47 -0700 (PDT)
Subject: Re: roland/build-nscd, roland/disable-nscd merged
References: <20120822203932.C831B2C08F@topped-with-meat.com><Pine.LNX.4.64.1208222205590.5229@digraph.polyomino.org.uk>
Fixed thusly.  (Clearly I had not in fact tested the default configuration
with the changes.  Oops.)  At some point I think it would be worthwhile to
clean up the getXX* et al code and the files that #include them such that
there could be a single header file for each database that defines all
those macros and each individual get*.c just includes that header and the
appropriate getXX* file.  Then a related cleanup would be to test something
other than just USE_NSCD in getXX* and have the aforementioned new header
set the new macro that just says "this database has nscd support".


Thanks,
Roland


	* 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.


diff --git a/gshadow/getsgent.c b/gshadow/getsgent.c
index 1242dee..e7998e9 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 7b1df53..546251c 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 203c210..2ee20a1 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 9e00f6e..a18f3df 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 12173db..b11ebd6 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 702d31d..56a8728 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 e744c90..4d6ef74 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 5b21bec..5333e75 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 4d0aab4..02f2c98 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 9c1b200..2837002 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 cf9a2d1..1e53c0f 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 1cf5bfa..4aaf5e6 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 09f1158..e449fa2 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 e46f441..ef7fb9f 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 3bee3d5..99ae014 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 0d5f31e..e3881b8 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 ef54c49..2cced62 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 9bc0b16..a3284f2 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 ea5cb82..f7ac9a7 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 b216276..371243e 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 a433bd7..e72d9ac 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 45a0d88..ff8629d 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 0f0e0d9..0546ece 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 3109c3b..d6e5f23 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 05d3a0a..b58fa64 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 ff2bf75..b0c8172 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 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"
diff --git a/shadow/getspent.c b/shadow/getspent.c
index 50dfcd3..d2a1db6 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 6292781..27cb5e8 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 beb0570..59ed79d 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 99c04f9..e1b6524 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"
Follow-Ups:
- Re: roland/build-nscd, roland/disable-nscd merged
  - From: Joseph S. Myers
References:
- roland/build-nscd, roland/disable-nscd merged
  - From: Roland McGrath
- Re: roland/build-nscd, roland/disable-nscd merged
  - From: Joseph S. Myers
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]