mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08:00
77fe0b9cd8
2002-02-25 Ulrich Drepper <drepper@redhat.com> * assert/assert-perr.c: Use INTUSE to reference functions and variables inside libc itself. Ise INTDEF and INTDEF2 to define appropriate aliases. Add prototypes for the new aliases. * assert/assert.c: Likewise. * include/libc-symbols.h: Likewise. * include/stdio.h: Likewise. * include/netinet/in.h: Likewise. * include/rpc/auth.h: Likewise. * include/rpc/auth_unix.h: Likewise. * include/rpc/key_prot.h: Likewise. * include/rpc/pmap_prot.h: Likewise. * include/rpc/pmap_rmt.h: Likewise. * include/rpc/rpc_msg.h: Likewise. * include/rpc/xdr.h: Likewise. * inet/gethstbyad_r.c: Likewise. * inet/gethstbynm2_r.c: Likewise. * inet/gethstbynm_r.c: Likewise. * inet/gethstent_r.c: Likewise. * inet/in6_addr.c: Likewise. * libio/__fpurge.c: Likewise. * libio/filedoalloc.c: Likewise. * libio/fileops.c: Likewise. * libio/ftello.c: Likewise. * libio/ftello64.c: Likewise. * libio/genops.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofflush_u.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgetpos64.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofgets_u.c: Likewise. * libio/iofopen.c: Likewise. * libio/iofopncook.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofread_u.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/iofsetpos64.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetline.c: Likewise. * libio/iogets.c: Likewise. * libio/iogetwline.c: Likewise. * libio/iolibio.h: Likewise. * libio/iopadn.c: Likewise. * libio/iopopen.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/ioungetwc.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/libioP.h: Likewise. * libio/memstream.c: Likewise. * libio/obprintf.c: Likewise. * libio/oldfileops.c: Likewise. * libio/oldiofclose.c: Likewise. * libio/oldiofdopen.c: Likewise. * libio/oldiofgetpos.c: Likewise. * libio/oldiofgetpos64.c: Likewise. * libio/oldiofopen.c: Likewise. * libio/oldiofsetpos.c: Likewise. * libio/oldiofsetpos64.c: Likewise. * libio/oldiopopen.c: Likewise. * libio/oldstdfiles.c: Likewise. * libio/putc.c: Likewise. * libio/setbuf.c: Likewise. * libio/setlinebuf.c: Likewise. * libio/stdfiles.c: Likewise. * libio/stdio.c: Likewise. * libio/strops.c: Likewise. * libio/vasprintf.c: Likewise. * libio/vscanf.c: Likewise. * libio/vsnprintf.c: Likewise. * libio/vswprintf.c: Likewise. * libio/wfiledoalloc.c: Likewise. * libio/wfileops.c: Likewise. * libio/wgenops.c: Likewise. * libio/wstrops.c: Likewise. * malloc/mtrace.c: Likewise. * misc/error.c: Likewise. * misc/syslog.c: Likewise. * nss/getXXbyYY_r.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/hosts-lookup.c: Likewise. * stdio-common/getw.c * stdio-common/printf-prs.c: Likewise. * stdio-common/printf_fp.c: Likewise. * stdio-common/printf_size.c: Likewise. * stdio-common/putw.c: Likewise. * stdio-common/scanf.c: Likewise. * stdio-common/sprintf.c: Likewise. * stdio-common/tmpfile64.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/strfmon.c: Likewise. * sunrpc/auth_des.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/authdes_prot.c: Likewise. * sunrpc/authuxprot.c: Likewise. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_raw.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/clnt_unix.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/key_prot.c: Likewise. * sunrpc/openchild.c: Likewise. * sunrpc/pm_getmaps.c: Likewise. * sunrpc/pm_getport.c: Likewise. * sunrpc/pmap_clnt.c: Likewise. * sunrpc/pmap_prot.c: Likewise. * sunrpc/pmap_prot2.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/rpc_cmsg.c: Likewise. * sunrpc/rpc_prot.c: Likewise. * sunrpc/svc_authux.c: Likewise. * sunrpc/svc_raw.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/svc_unix.c: Likewise. * sunrpc/xdr.c: Likewise. * sunrpc/xdr_array.c: Likewise. * sunrpc/xdr_mem.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. * sysdeps/generic/_strerror.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * sysdeps/generic/tmpfile.c: Likewise. * sysdeps/gnu/errlist.awk: Likewise. * sysdeps/gnu/errlist.c: Likewise. * libio/Makefile (routines): Remove iosprint. * libio/iosprintf.c: Removed
259 lines
7.3 KiB
C
259 lines
7.3 KiB
C
/* Copyright (C) 1996,97,98,99,2000,2001,2002 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 <assert.h>
|
|
#include <errno.h>
|
|
#include "nsswitch.h"
|
|
#ifdef USE_NSCD
|
|
# include <nscd/nscd_proto.h>
|
|
#endif
|
|
#ifdef NEED__RES_HCONF
|
|
# include <resolv/res_hconf.h>
|
|
#endif
|
|
#ifdef NEED__RES
|
|
# include <resolv.h>
|
|
#endif
|
|
/*******************************************************************\
|
|
|* Here we assume several symbols to be defined: *|
|
|
|* *|
|
|
|* LOOKUP_TYPE - the return type of the function *|
|
|
|* *|
|
|
|* FUNCTION_NAME - name of the non-reentrant function *|
|
|
|* *|
|
|
|* DATABASE_NAME - name of the database the function accesses *|
|
|
|* (e.g., host, services, ...) *|
|
|
|* *|
|
|
|* ADD_PARAMS - additional parameter, can vary in number *|
|
|
|* *|
|
|
|* ADD_VARIABLES - names of additional parameter *|
|
|
|* *|
|
|
|* Optionally the following vars can be defined: *|
|
|
|* *|
|
|
|* NEED_H_ERRNO - an extra parameter will be passed to point to *|
|
|
|* the global `h_errno' variable. *|
|
|
|* *|
|
|
|* NEED__RES - the global _res variable might be used so we *|
|
|
|* will have to initialize it if necessary *|
|
|
|* *|
|
|
|* PREPROCESS - code run before anything else *|
|
|
|* *|
|
|
|* POSTPROCESS - code run after the lookup *|
|
|
|* *|
|
|
\*******************************************************************/
|
|
|
|
/* To make the real sources a bit prettier. */
|
|
#define REENTRANT_NAME APPEND_R (FUNCTION_NAME)
|
|
#define APPEND_R(name) APPEND_R1 (name)
|
|
#define APPEND_R1(name) name##_r
|
|
#define INTERNAL(name) INTERNAL1 (name)
|
|
#define INTERNAL1(name) __##name
|
|
|
|
#ifdef USE_NSCD
|
|
# define NSCD_NAME ADD_NSCD (REENTRANT_NAME)
|
|
# define ADD_NSCD(name) ADD_NSCD1 (name)
|
|
# define ADD_NSCD1(name) __nscd_##name
|
|
# define NOT_USENSCD_NAME ADD_NOT_NSCDUSE (DATABASE_NAME)
|
|
# define ADD_NOT_NSCDUSE(name) ADD_NOT_NSCDUSE1 (name)
|
|
# define ADD_NOT_NSCDUSE1(name) __nss_not_use_nscd_##name
|
|
#endif
|
|
|
|
#define FUNCTION_NAME_STRING STRINGIZE (FUNCTION_NAME)
|
|
#define REENTRANT_NAME_STRING STRINGIZE (REENTRANT_NAME)
|
|
#define DATABASE_NAME_STRING STRINGIZE (DATABASE_NAME)
|
|
#define STRINGIZE(name) STRINGIZE1 (name)
|
|
#define STRINGIZE1(name) #name
|
|
|
|
#ifndef DB_LOOKUP_FCT
|
|
# define DB_LOOKUP_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
|
|
#endif
|
|
|
|
/* Sometimes we need to store error codes in the `h_errno' variable. */
|
|
#ifdef NEED_H_ERRNO
|
|
# define H_ERRNO_PARM , int *h_errnop
|
|
# define H_ERRNO_VAR , h_errnop
|
|
# define H_ERRNO_VAR_P h_errnop
|
|
#else
|
|
# define H_ERRNO_PARM
|
|
# define H_ERRNO_VAR
|
|
# define H_ERRNO_VAR_P NULL
|
|
#endif
|
|
|
|
#ifndef HAVE_TYPE
|
|
# define TYPE_VAR_P NULL
|
|
# define FLAGS_VAR 0
|
|
#endif
|
|
|
|
#ifdef HAVE_AF
|
|
# define AF_VAR_P &af
|
|
#else
|
|
# define AF_VAR_P NULL
|
|
#endif
|
|
|
|
/* Type of the lookup function we need here. */
|
|
typedef enum nss_status (*lookup_function) (ADD_PARAMS, LOOKUP_TYPE *, char *,
|
|
size_t, int * H_ERRNO_PARM);
|
|
|
|
/* The lookup function for the first entry of this service. */
|
|
extern int DB_LOOKUP_FCT (service_user **nip, const char *name, void **fctp);
|
|
|
|
/* Interval in which we transfer retry to contact the NSCD. */
|
|
#define NSS_NSCD_RETRY 100
|
|
|
|
|
|
int
|
|
INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
|
|
size_t buflen, LOOKUP_TYPE **result H_ERRNO_PARM)
|
|
{
|
|
static service_user *startp;
|
|
static lookup_function start_fct;
|
|
service_user *nip;
|
|
lookup_function fct;
|
|
int no_more;
|
|
enum nss_status status = NSS_STATUS_UNAVAIL;
|
|
#ifdef USE_NSCD
|
|
int nscd_status;
|
|
#endif
|
|
|
|
#ifdef PREPROCESS
|
|
PREPROCESS;
|
|
#endif
|
|
|
|
#ifdef HANDLE_DIGITS_DOTS
|
|
switch (__nss_hostname_digits_dots (name, resbuf, &buffer, NULL,
|
|
buflen, result, &status,
|
|
TYPE_VAR_P, FLAGS_VAR, AF_VAR_P,
|
|
H_ERRNO_VAR_P))
|
|
{
|
|
case -1:
|
|
return errno;
|
|
case 1:
|
|
goto done;
|
|
}
|
|
#endif
|
|
|
|
#ifdef USE_NSCD
|
|
if (NOT_USENSCD_NAME && ++NOT_USENSCD_NAME > NSS_NSCD_RETRY)
|
|
NOT_USENSCD_NAME = 0;
|
|
|
|
if (!NOT_USENSCD_NAME)
|
|
{
|
|
nscd_status = NSCD_NAME (ADD_VARIABLES, resbuf, buffer, buflen
|
|
H_ERRNO_VAR);
|
|
if (nscd_status >= 0)
|
|
{
|
|
*result = nscd_status == 0 ? resbuf : NULL;
|
|
return nscd_status;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
if (startp == NULL)
|
|
{
|
|
no_more = DB_LOOKUP_FCT (&nip, REENTRANT_NAME_STRING, (void **) &fct);
|
|
if (no_more)
|
|
startp = (service_user *) -1l;
|
|
else
|
|
{
|
|
startp = nip;
|
|
start_fct = fct;
|
|
|
|
#ifdef NEED__RES
|
|
/* The resolver code will really be used so we have to
|
|
initialize it. */
|
|
if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1)
|
|
{
|
|
*h_errnop = NETDB_INTERNAL;
|
|
*result = NULL;
|
|
return errno;
|
|
}
|
|
#endif /* need _res */
|
|
#ifdef NEED__RES_HCONF
|
|
if (!_res_hconf.initialized)
|
|
_res_hconf_init ();
|
|
#endif /* need _res_hconf */
|
|
}
|
|
}
|
|
else
|
|
{
|
|
fct = start_fct;
|
|
no_more = (nip = startp) == (service_user *) -1l;
|
|
}
|
|
|
|
while (no_more == 0)
|
|
{
|
|
status = DL_CALL_FCT (fct, (ADD_VARIABLES, resbuf, buffer, buflen,
|
|
&errno H_ERRNO_VAR));
|
|
|
|
/* The status is NSS_STATUS_TRYAGAIN and errno is ERANGE the
|
|
provided buffer is too small. In this case we should give
|
|
the user the possibility to enlarge the buffer and we should
|
|
not simply go on with the next service (even if the TRYAGAIN
|
|
action tells us so). */
|
|
if (status == NSS_STATUS_TRYAGAIN
|
|
#ifdef NEED_H_ERRNO
|
|
&& *h_errnop == NETDB_INTERNAL
|
|
#endif
|
|
&& errno == ERANGE)
|
|
break;
|
|
|
|
no_more = __nss_next (&nip, REENTRANT_NAME_STRING,
|
|
(void **) &fct, status, 0);
|
|
}
|
|
|
|
#ifdef HANDLE_DIGITS_DOTS
|
|
done:
|
|
#endif
|
|
*result = status == NSS_STATUS_SUCCESS ? resbuf : NULL;
|
|
#ifdef POSTPROCESS
|
|
POSTPROCESS;
|
|
#endif
|
|
return status == NSS_STATUS_SUCCESS ? 0 : errno;
|
|
}
|
|
|
|
|
|
#include <shlib-compat.h>
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1_2)
|
|
#define OLD(name) OLD1 (name)
|
|
#define OLD1(name) __old_##name
|
|
|
|
int
|
|
OLD (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
|
|
size_t buflen, LOOKUP_TYPE **result H_ERRNO_PARM)
|
|
{
|
|
int ret = INTERNAL (REENTRANT_NAME) (ADD_VARIABLES, resbuf, buffer,
|
|
buflen, result H_ERRNO_VAR);
|
|
|
|
if (ret != 0)
|
|
ret = -1;
|
|
|
|
return ret;
|
|
}
|
|
|
|
#define do_symbol_version(real, name, version) \
|
|
compat_symbol (libc, real, name, version)
|
|
do_symbol_version (OLD (REENTRANT_NAME), REENTRANT_NAME, GLIBC_2_0);
|
|
#endif
|
|
|
|
#define do_default_symbol_version(real, name, version) \
|
|
versioned_symbol (libc, real, name, version)
|
|
do_default_symbol_version (INTERNAL (REENTRANT_NAME),
|
|
REENTRANT_NAME, GLIBC_2_1_2);
|