aboutsummaryrefslogtreecommitdiff
path: root/nss
diff options
context:
space:
mode:
Diffstat (limited to 'nss')
-rw-r--r--nss/Makefile6
-rw-r--r--nss/getXXent_r.c20
-rw-r--r--nss/key-lookup.c23
-rw-r--r--nss/nss_files/files-netgrp.c2
4 files changed, 43 insertions, 8 deletions
diff --git a/nss/Makefile b/nss/Makefile
index a921bb7..93ffbae 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -33,7 +33,7 @@ routines = nsswitch $(addsuffix -lookup,$(databases))
# Caution: if you add a database here, you must add its real name
# in databases.def, too.
databases = proto service hosts network grp pwd rpc ethers \
- spwd netgrp
+ spwd netgrp key
# Specify rules for the nss_* modules. We have some services.
services := files dns db
@@ -48,12 +48,12 @@ subdir-dirs = $(services:%=nss_%)
vpath %.c $(subdir-dirs)
-libnss_files-routines := $(addprefix files-,$(databases))
+libnss_files-routines := $(addprefix files-,$(filter-out key, $(databases)))
distribute += files-XXX.c files-parse.c
libnss_dns-routines := dns-host dns-network
-libnss_db-routines := $(addprefix db-,$(filter-out hosts network,\
+libnss_db-routines := $(addprefix db-,$(filter-out hosts network key,\
$(databases)))
generated += $(filter-out db-netgrp.c, \
$(addsuffix .c,$(libnss_db-routines)))
diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c
index 52e2136..0db0a8b 100644
--- a/nss/getXXent_r.c
+++ b/nss/getXXent_r.c
@@ -96,6 +96,8 @@ typedef int (*get_function) (LOOKUP_TYPE *, char *, int H_ERRNO_PARM);
/* This handle for the NSS data base is shared between all
set/get/endXXXent functions. */
static service_user *nip;
+/* Remember the last service used since the last call to `endXXent'. */
+static service_user *last_nip;
/* Remember the first service_entry, it's always the same. */
static service_user *startp;
@@ -159,12 +161,14 @@ SETFUNC_NAME (STAYOPEN)
no_more = setup ((void **) &fct, SETFUNC_NAME_STRING, 1);
while (! no_more)
{
+ int is_last_nip = nip == last_nip;
enum nss_status status = (*fct) (STAYOPEN_VAR);
no_more = __nss_next (&nip, SETFUNC_NAME_STRING, (void **) &fct,
- status, 1);
+ status, 0);
+ if (is_last_nip)
+ last_nip = nip;
}
- nip = NULL;
#ifdef STAYOPEN_TMP
STAYOPEN_TMPVAR = STAYOPEN_VAR;
@@ -197,9 +201,13 @@ ENDFUNC_NAME (void)
/* Ignore status, we force check in __NSS_NEXT. */
(void) (*fct) ();
+ if (nip == last_nip)
+ /* We have processed all services which were used. */
+ break;
+
no_more = __nss_next (&nip, ENDFUNC_NAME_STRING, (void **) &fct, 0, 1);
}
- nip = NULL;
+ last_nip = nip = NULL;
__libc_lock_unlock (lock);
}
@@ -232,6 +240,7 @@ INTERNAL (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, size_t buflen,
no_more = setup ((void **) &fct, GETFUNC_NAME_STRING, 0);
while (! no_more)
{
+ int is_last_nip = nip == last_nip;
service_user *current_nip = nip;
status = (*fct) (resbuf, buffer, buflen H_ERRNO_VAR);
@@ -239,11 +248,14 @@ INTERNAL (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, size_t buflen,
no_more = __nss_next (&nip, GETFUNC_NAME_STRING, (void **) &fct,
status, 0);
+ if (is_last_nip)
+ last_nip = nip;
+
if (! no_more && current_nip != nip)
/* Call the `setXXent' function. This wasn't done before. */
do
{
- set_function *sfct;
+ set_function sfct;
no_more = __nss_lookup (&nip, SETFUNC_NAME_STRING,
(void **) &sfct);
diff --git a/nss/key-lookup.c b/nss/key-lookup.c
new file mode 100644
index 0000000..1730f74
--- /dev/null
+++ b/nss/key-lookup.c
@@ -0,0 +1,23 @@
+/* Copyright (C) 1996 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#define DATABASE_NAME publickey
+#define DEFAULT_CONFIG "nis nisplus"
+
+#include "XXX-lookup.c"
diff --git a/nss/nss_files/files-netgrp.c b/nss/nss_files/files-netgrp.c
index 5f8b939..83e1382 100644
--- a/nss/nss_files/files-netgrp.c
+++ b/nss/nss_files/files-netgrp.c
@@ -160,7 +160,7 @@ _nss_files_endnetgrent (struct __netgrent *result)
}
-static enum nss_status
+enum nss_status
_nss_netgroup_parseline (char **cursor, struct __netgrent *result,
char *buffer, int buflen)
{