aboutsummaryrefslogtreecommitdiff
path: root/nss/nss_db
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-08-25 17:19:50 +0000
committerUlrich Drepper <drepper@redhat.com>1999-08-25 17:19:50 +0000
commit71d3bda9a7a15bf3f935ffcde8aeceefef8074f7 (patch)
tree3188ef1b1ad5a60d512813dadfc756225dda0ff4 /nss/nss_db
parentad65970214c9dfaa6b61b9519cb0667b376e14d9 (diff)
downloadglibc-71d3bda9a7a15bf3f935ffcde8aeceefef8074f7.tar
glibc-71d3bda9a7a15bf3f935ffcde8aeceefef8074f7.tar.gz
glibc-71d3bda9a7a15bf3f935ffcde8aeceefef8074f7.tar.bz2
glibc-71d3bda9a7a15bf3f935ffcde8aeceefef8074f7.zip
Update.
1999-08-25 Ulrich Drepper <drepper@cygnus.com> * inet/Makefile (routines): Add getipnodebynm. * inet/getipnodebynm.c: New file. * nss/digits_dots.c: If HAVE_TYPE is define type contains the interface type. * nss/nss_files/files-XXX.c: Define EXTRA_ARGS, EXTRA_ARGS_DECL, and EXTRA_ARGS_VALUE is not already done. (internal_getent): Allow extra parameters and pass them to parse_line. (_nss_files_get,ENTNAME_r): Pass extra parameters to internal_getent. (_nss_files_get##name##_r): Likewise. * nss/nss_files/files-hosts.c: Define EXTRA_ARGS, EXTRA_ARGS_DECL, and EXTRA_ARGS_VALUE to pass flags and type to parser. Add getipnodebyname function. * nss/nss_files/files-parse.c: Define EXTRA_ARGS, EXTRA_ARGS_DECL, and EXTRA_ARGS_VALUE is not already done. (parse_line): Add EXTRA_ARGS_DECL to parameter list. * nss/nss_db/db-XXX.c (lookup): Allow extra parameters and pass them to parse_line. (_nss_db_get##name##_r): Pass extra parameters to lookup. (_nss_db_get,ENTNAME_r): Likewise. * sysdeps/generic/if_index.c (__protocol_available): New function. * sysdeps/unix/sysv/linux/if_index.c: Likewise.
Diffstat (limited to 'nss/nss_db')
-rw-r--r--nss/nss_db/db-XXX.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c
index 7356b34462..1cbe8c291e 100644
--- a/nss/nss_db/db-XXX.c
+++ b/nss/nss_db/db-XXX.c
@@ -1,5 +1,5 @@
/* Common code for DB-based databases in nss_db module.
- Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999 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
@@ -162,7 +162,7 @@ CONCAT(_nss_db_end,ENTNAME) (void)
/* Do a database lookup for KEY. */
static enum nss_status
lookup (DBT *key, struct STRUCTURE *result,
- void *buffer, size_t buflen, int *errnop H_ERRNO_PROTO)
+ void *buffer, size_t buflen, int *errnop H_ERRNO_PROTO EXTRA_ARGS_DECL)
{
char *p;
enum nss_status status;
@@ -211,7 +211,7 @@ lookup (DBT *key, struct STRUCTURE *result,
while (isspace (*p))
++p;
- err = parse_line (p, result, buffer, buflen, errnop);
+ err = parse_line (p, result, buffer, buflen, errnop EXTRA_ARGS);
if (err == 0)
{
@@ -274,7 +274,8 @@ _nss_db_get##name##_r (proto, \
key.size = KEYPRINTF keypattern; \
key.flags = 0; \
__libc_lock_lock (lock); \
- status = lookup (&key, result, buffer, buflen, errnop H_ERRNO_ARG); \
+ status = lookup (&key, result, buffer, buflen, errnop H_ERRNO_ARG \
+ EXTRA_ARGS_VALUE); \
__libc_lock_unlock (lock); \
return status; \
}
@@ -302,7 +303,8 @@ CONCAT(_nss_db_get,ENTNAME_r) (struct STRUCTURE *result, char *buffer,
{
key.size = snprintf (key.data = buf, sizeof buf, "0%u", entidx++);
key.flags = 0;
- status = lookup (&key, result, buffer, buflen, errnop H_ERRNO_ARG);
+ status = lookup (&key, result, buffer, buflen, errnop H_ERRNO_ARG
+ EXTRA_ARGS_VALUE);
if (status == NSS_STATUS_TRYAGAIN
#ifdef NEED_H_ERRNO
&& *herrnop == NETDB_INTERNAL