OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Roland McGrath 2012-08-22 16:06:53 -07:00
parent eaeffd07f7
commit f04e213208
40 changed files with 195 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ChangeLog
View File

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

5
gshadow/getsgent.c
View File

@ -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"

5
gshadow/getsgent_r.c
View File

@ -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"

5
gshadow/getsgnam.c
View File

@ -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"

5
gshadow/getsgnam_r.c
View File

@ -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"

5
inet/getaliasent.c
View File

@ -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"

5
inet/getaliasent_r.c
View File

@ -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"

5
inet/getaliasname.c
View File

@ -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"

5
inet/getaliasname_r.c
View File

@ -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"

5
inet/getnetbyad.c
View File

@ -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"

5
inet/getnetbyad_r.c
View File

@ -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"

5
inet/getnetbynm.c
View File

@ -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"

5
inet/getnetbynm_r.c
View File

@ -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"

5
inet/getnetent.c
View File

@ -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"

5
inet/getnetent_r.c
View File

@ -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"

5
inet/getproto.c
View File

@ -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"

5
inet/getproto_r.c
View File

@ -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"

5
inet/getprtent.c
View File

@ -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"

5
inet/getprtent_r.c
View File

@ -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"

5
inet/getprtname.c
View File

@ -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"

5
inet/getprtname_r.c
View File

@ -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"

5
inet/getrpcbyname.c
View File

@ -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"

5
inet/getrpcbyname_r.c
View File

@ -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"

5
inet/getrpcbynumber.c
View File

@ -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"

5
inet/getrpcbynumber_r.c
View File

@ -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"

5
inet/getrpcent.c
View File

@ -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"

5
inet/getrpcent_r.c
View File

@ -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"

3
nscd/gai.c
View File

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

5
nscd/getgrgid_r.c
View File

@ -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>

5
nscd/getgrnam_r.c
View File

@ -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>

5
nscd/gethstbyad_r.c
View File

@ -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"

5
nscd/gethstbynm3_r.c
View File

@ -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"

5
nscd/getpwnam_r.c
View File

@ -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>

5
nscd/getpwuid_r.c
View File

@ -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>

5
nscd/getsrvbynm_r.c
View File

@ -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"

5
nscd/getsrvbypt_r.c
View File

@ -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"

5
shadow/getspent.c
View File

@ -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"

5
shadow/getspent_r.c
View File

@ -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"

5
shadow/getspnam.c
View File

@ -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"

5
shadow/getspnam_r.c
View File

@ -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"