384ca55174
gethstbynm3_r. * nscd/gethstbynm2_r.c: Remove. * nscd/gethstbynm3_r.c: New file. * nscd/aicache.c (addhstaiX): Use __gethostbyaddr2_r instead of __gethostbyaddr_r. * nscd/gethstbyad_r.c: Generate __gethostbyaddr2_r function. Define __gethostbyaddr_r compatibility wrapper. * nscd/hstcache.c (cache_addhst): Add ttl parameter. Use it when determining timeout of entry. (lookup): Take new parameter and pass it to __gethostbyname3_r and __gethostbyaddr2_r. (addhstbyX): Pass reference to variable for TTL to lookup and cache_addhst. * nss/Versions [glibc] (GLIBC_PRIVATE): Export __nss_passwd_lookup2, __nss_group_lookup2, __nss_hosts_lookup2, __nss_services_lookup2, and __nss_next2. Remove __nss_services_lookup. * nss/XXX-lookup.c: Name function now *_lookup2. Add new parameter. Add compat wrapper. * nss/getXXbyYY_r.c: Changes to call new *_lookup2 functions and __nss_next2. * nss/getXXent_r.c: Likewise. * nss/getnssent_r.c: Likewise. * nss/nsswitch.c (__nss_lookup): Add new parameter. If first function does not exist in module, try the optional second name. (__nss_next2): New function. (__nss_next): Now wrapper around __nss_next2. * nss/nsswitch.h: Adjust __nss_lookup prototype. Declare __nss_next2. Adjust definition of db_lookup_function type. * nss/service-lookup.c: Define NO_COMPAT. * include/netdb.h: Declare __gethostbyaddr2_r and __gethostbyname3_r. * inet/ether_hton.c: Use __nss_next2 instead of __nss_next. * inet/ether_ntoh.c: Likewise. * sunrpc/netname.c: Likewise. * sunrpc/publickey.c: Likewise. * inet/getnetgrent.c: Likewise. Adjust calls to __nss_lookup. * inet/gethstbyad_r.c (DB_LOOKUP_FCT): Change to __nss_hosts_lookup2. * inet/gethstbynm2_r.c (DB_LOOKUP_FCT): Likewise. * inet/gethstbynm_r.c (DB_LOOKUP_FCT): Likewise. * inet/gethstent_r.c (DB_LOOKUP_FCT): Likewise. * nscd/aicache.c (addhstaiX): Fix default TTL handling. * inet/getnetgrent.c (setup): Encrypt static pointer.
89 lines
3.0 KiB
C
89 lines
3.0 KiB
C
/* Copyright (C) 1996, 1997, 1999, 2000, 2002, 2007 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 Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include "nsswitch.h"
|
|
|
|
/*******************************************************************\
|
|
|* Here we assume one symbol to be defined: *|
|
|
|* *|
|
|
|* DATABASE_NAME - name of the database the function accesses *|
|
|
|* (e.g., hosts, services, ...) *|
|
|
|* *|
|
|
|* One additional symbol may optionally be defined: *|
|
|
|* *|
|
|
|* ALTERNATE_NAME - name of another service which is examined in *|
|
|
|* case DATABASE_NAME is not found *|
|
|
|* *|
|
|
|* DEFAULT_CONFIG - string for default conf (e.g. "dns files") *|
|
|
|* *|
|
|
\*******************************************************************/
|
|
|
|
#define DB_LOOKUP_FCT CONCAT3_1 (__nss_, DATABASE_NAME, _lookup2)
|
|
#define DB_COMPAT_FCT CONCAT3_1 (__nss_, DATABASE_NAME, _lookup)
|
|
#define CONCAT3_1(Pre, Name, Post) CONCAT3_2 (Pre, Name, Post)
|
|
#define CONCAT3_2(Pre, Name, Post) Pre##Name##Post
|
|
|
|
#define DATABASE_NAME_SYMBOL CONCAT3_1 (__nss_, DATABASE_NAME, _database)
|
|
#define DATABASE_NAME_STRING STRINGIFY1 (DATABASE_NAME)
|
|
#define STRINGIFY1(Name) STRINGIFY2 (Name)
|
|
#define STRINGIFY2(Name) #Name
|
|
|
|
#ifdef ALTERNATE_NAME
|
|
#define ALTERNATE_NAME_STRING STRINGIFY1 (ALTERNATE_NAME)
|
|
#else
|
|
#define ALTERNATE_NAME_STRING NULL
|
|
#endif
|
|
|
|
#ifndef DEFAULT_CONFIG
|
|
#define DEFAULT_CONFIG NULL
|
|
#endif
|
|
|
|
service_user *DATABASE_NAME_SYMBOL attribute_hidden;
|
|
|
|
extern int DB_LOOKUP_FCT (service_user **ni, const char *fct_name,
|
|
const char *fct2_name, void **fctp)
|
|
internal_function;
|
|
libc_hidden_proto (DB_LOOKUP_FCT)
|
|
|
|
int
|
|
internal_function
|
|
DB_LOOKUP_FCT (service_user **ni, const char *fct_name, const char *fct2_name,
|
|
void **fctp)
|
|
{
|
|
if (DATABASE_NAME_SYMBOL == NULL
|
|
&& __nss_database_lookup (DATABASE_NAME_STRING, ALTERNATE_NAME_STRING,
|
|
DEFAULT_CONFIG, &DATABASE_NAME_SYMBOL) < 0)
|
|
return -1;
|
|
|
|
*ni = DATABASE_NAME_SYMBOL;
|
|
|
|
return __nss_lookup (ni, fct_name, fct2_name, fctp);
|
|
}
|
|
libc_hidden_def (DB_LOOKUP_FCT)
|
|
|
|
|
|
#ifndef NO_COMPAT
|
|
int
|
|
internal_function attribute_compat_text_section
|
|
DB_COMPAT_FCT (service_user **ni, const char *fct_name, void **fctp)
|
|
{
|
|
return DB_LOOKUP_FCT (ni, fct_name, NULL, fctp);
|
|
}
|
|
#endif
|