diff options
Diffstat (limited to 'nss')
-rw-r--r-- | nss/Makefile | 9 | ||||
-rw-r--r-- | nss/databases.def | 3 | ||||
-rw-r--r-- | nss/nss_db/db-init.c | 4 |
3 files changed, 5 insertions, 11 deletions
diff --git a/nss/Makefile b/nss/Makefile index 65c094d689..13accaa01d 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1996-1998,2000-2002,2007,2009,2010,2011 +# Copyright (C) 1996-1998,2000-2002,2007,2009,2010,2011,2012 # Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -22,9 +22,6 @@ subdir := nss headers := nss.h -distribute := nsswitch.h XXX-lookup.c getXXbyYY.c getXXbyYY_r.c \ - getXXent.c getXXent_r.c databases.def \ - nsswitch.conf digits_dots.c function.def # This is the trivial part which goes into libc itself. routines = nsswitch getnssent getnssent_r digits_dots \ @@ -66,7 +63,6 @@ vpath %.c $(subdir-dirs) ../locale/programs ../intl libnss_files-routines := $(addprefix files-,$(databases)) \ files-initgroups files-have_o_cloexec files-init -distribute += files-XXX.c files-parse.c libnss_db-dbs := $(addprefix db-,\ $(filter-out hosts network key alias,\ @@ -75,7 +71,6 @@ libnss_db-dbs := $(addprefix db-,\ libnss_db-routines := $(libnss_db-dbs) db-open db-init hash-string generated += $(filter-out db-alias.c db-netgrp.c, \ $(addsuffix .c,$(libnss_db-dbs))) -distribute += $(addprefix nss_db/, db-XXX.c nss_db.h) install-others += $(inst_vardbdir)/Makefile @@ -118,8 +113,6 @@ $(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o) $(inst_vardbdir)/Makefile: db-Makefile $(+force) $(do-install) -distribute += nss_test1.c - CFLAGS-nss_test1.c = -DNOT_IN_libc=1 $(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(common-objpfx)libc.so \ $(common-objpfx)libc_nonshared.a diff --git a/nss/databases.def b/nss/databases.def index 755fbe201a..0247aa9637 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, 2005, 2011 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 2005, 2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -23,6 +23,7 @@ DEFINE_DATABASE (aliases) DEFINE_DATABASE (ethers) DEFINE_DATABASE (group) +DEFINE_DATABASE (gshadow) DEFINE_DATABASE (hosts) DEFINE_DATABASE (initgroups) DEFINE_DATABASE (netgroup) diff --git a/nss/nss_db/db-init.c b/nss/nss_db/db-init.c index 906331ae0a..d23e8f81d6 100644 --- a/nss/nss_db/db-init.c +++ b/nss/nss_db/db-init.c @@ -1,5 +1,5 @@ /* Initialization in nss_db module. - Copyright (C) 2011 Free Software Foundation, Inc. + Copyright (C) 2011, 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 @@ -18,7 +18,7 @@ #include <paths.h> #include <nscd/nscd.h> - +#include <string.h> static union { |