summaryrefslogtreecommitdiff
path: root/nss
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2005-12-21 09:35:28 +0000
committerJakub Jelinek <jakub@redhat.com>2005-12-21 09:35:28 +0000
commitbaa0a2c9a410a88fcacdf82abc7d21b0c99c7cd3 (patch)
tree23761bbdd386ee804a16e3483d30adb8bc204c3a /nss
parent2bf037b4e8e189e910a41744d79404b94235ab8b (diff)
downloadglibc-baa0a2c9a410a88fcacdf82abc7d21b0c99c7cd3.tar.gz
Updated to fedora-glibc-20051221T0931
Diffstat (limited to 'nss')
-rw-r--r--nss/databases.def5
-rw-r--r--nss/nsswitch.c6
2 files changed, 6 insertions, 5 deletions
diff --git a/nss/databases.def b/nss/databases.def
index 27c15fc04f..c35d7f18c2 100644
--- a/nss/databases.def
+++ b/nss/databases.def
@@ -1,5 +1,5 @@
/* List of all databases defined for the NSS in GNU C Library.
- Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -18,7 +18,8 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-/* This list must be kept sorted!!! */
+/* This list must be kept sorted!!! If any long name is added the
+ field size for it must be increases. */
DEFINE_DATABASE (aliases)
DEFINE_DATABASE (ethers)
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 895b17825a..7e5e6e8164 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
+/* Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -59,9 +59,9 @@ static service_library *nss_new_service (name_database *database,
#undef DEFINE_DATABASE
/* Structure to map database name to variable. */
-static struct
+static const struct
{
- const char *name;
+ const char name[10];
service_user **dbp;
} databases[] =
{