mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
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.
83 lines
2.3 KiB
C
83 lines
2.3 KiB
C
/* Copyright (C) 1996, 1999, 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 <errno.h>
|
|
#include <netinet/ether.h>
|
|
#include <netinet/if_ether.h>
|
|
#include <string.h>
|
|
|
|
#include "../nss/nsswitch.h"
|
|
|
|
/* Type of the lookup function we need here. */
|
|
typedef int (*lookup_function) (const char *, struct etherent *, char *, int,
|
|
int *);
|
|
|
|
/* The lookup function for the first entry of this service. */
|
|
extern int __nss_ethers_lookup (service_user **nip, const char *name,
|
|
void **fctp) internal_function;
|
|
|
|
|
|
int
|
|
ether_hostton (const char *hostname, struct ether_addr *addr)
|
|
{
|
|
static service_user *startp;
|
|
static lookup_function start_fct;
|
|
service_user *nip;
|
|
union
|
|
{
|
|
lookup_function f;
|
|
void *ptr;
|
|
} fct;
|
|
int no_more;
|
|
enum nss_status status = NSS_STATUS_UNAVAIL;
|
|
struct etherent etherent;
|
|
|
|
if (startp == NULL)
|
|
{
|
|
no_more = __nss_ethers_lookup (&nip, "gethostton_r", &fct.ptr);
|
|
if (no_more)
|
|
startp = (service_user *) -1;
|
|
else
|
|
{
|
|
startp = nip;
|
|
start_fct = fct.f;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
fct.f = start_fct;
|
|
no_more = (nip = startp) == (service_user *) -1;
|
|
}
|
|
|
|
while (no_more == 0)
|
|
{
|
|
char buffer[1024];
|
|
|
|
status = (*fct.f) (hostname, ðerent, buffer, sizeof buffer, &errno);
|
|
|
|
no_more = __nss_next2 (&nip, "gethostton_r", NULL, &fct.ptr, status, 0);
|
|
}
|
|
|
|
if (status == NSS_STATUS_SUCCESS)
|
|
memcpy (addr, etherent.e_addr.ether_addr_octet,
|
|
sizeof (struct ether_addr));
|
|
|
|
return status == NSS_STATUS_SUCCESS ? 0 : -1;
|
|
}
|