mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-31 22:10:34 +03:00 
			
		
		
		
	1999-12-03 Andreas Jaeger <aj@suse.de> * nss/getXXbyYY.c: Include <resolv.h> (FUNCTION_NAME): Use res_ninit instead of res_init. * nss/getXXbyYY_r.c [NEED__RES]: Include <resolv.h> for _res declaration and prototypes. Remove extra _res declaration. (INTERNAL): Use thread aware res_ninit function. * inet/gethstbyad_r.c: Include <resolv.h>. * resolv/res_data.c: Update from Bind 8.2.2-P5. Moved res_init to res_libc.c. Disabled unneeded functions. * resolv/res_libc.c: New file. * Versions.def: Add version GLIBC_2.2 for libpthread. Add versions GLIBC_2.1 and GLIBC_2.2 for libresolv. * include/resolv.h: Add internal interfaces. * resolv/Makefile (routines): Add new files. (libresolv-routines): Likewise. (distribute): Likewise. * resolv/gethnamaddr.c: Use thread safe resolver functions. * resolv/nss_dns/dns-host.c: Likewise. * resolv/nss_dns/dns-network.c: Likewise. * resolv/arpa/nameser.h: Update from Bind 8.2.2-P5. * resolv/nsap_addr.c: Likewise. * resolv/res_comp.c: Likewise. * resolv/res_debug.c: Likewise. * resolv/res_init.c: Likewise. * resolv/res_mkquery.c: Likewise. * resolv/res_query.c: Likewise. * resolv/res_send.c: Likewise. * resolv/resolv.h: Likewise. * resolv/Versions: Add __res_state and __res_ninit with version GLIBC_2.2 to libc. Add new interfaces with version GLIBC_2.2 to libresolv. * resolv/Banner: Update. * include/arpa/nameser_compat.h: New file. * resolv/ns_name.c: New file from Bind 8.2.2-P5. * resolv/ns_netint.c: Likewise. * resolv/ns_parse.c: Likewise. * resolv/ns_print.c: Likewise. * resolv/ns_samedomain.c: Likewise. * resolv/ns_ttl.c: Likewise. * resolv/arpa/nameser_compat.h: Likewise. * resolv/res_debug.h: Likewise. Some patches are based on work done by Adam D. Bradley <artdodge@cs.bu.edu>. * sysdeps/unix/sysv/linux/configure.in: Remove check for ldconfig, set always use_ldconfig instead.
		
			
				
	
	
		
			172 lines
		
	
	
		
			4.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			172 lines
		
	
	
		
			4.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* 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
 | |
|    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.  */
 | |
| 
 | |
| #include <assert.h>
 | |
| #include <errno.h>
 | |
| #include <bits/libc-lock.h>
 | |
| #include <stdlib.h>
 | |
| #include <resolv.h>
 | |
| 
 | |
| #include "nsswitch.h"
 | |
| 
 | |
| /*******************************************************************\
 | |
| |* 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		   *|
 | |
| |* 								   *|
 | |
| |* BUFLEN	 - length of buffer allocated for the non	   *|
 | |
| |*		   reentrant version				   *|
 | |
| |* 								   *|
 | |
| |* Optionally the following vars can be defined:		   *|
 | |
| |* 								   *|
 | |
| |* NEED_H_ERRNO  - an extra parameter will be passed to point to   *|
 | |
| |*		   the global `h_errno' variable.		   *|
 | |
| |* 								   *|
 | |
| \*******************************************************************/
 | |
| 
 | |
| /* 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
 | |
| 
 | |
| /* 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_errno_tmp
 | |
| #else
 | |
| # define H_ERRNO_PARM
 | |
| # define H_ERRNO_VAR
 | |
| #endif
 | |
| 
 | |
| 
 | |
| /* Prototype for reentrant version we use here.  */
 | |
| extern int INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf,
 | |
| 				      char *buffer, size_t buflen,
 | |
| 				      LOOKUP_TYPE **result H_ERRNO_PARM);
 | |
| 
 | |
| /* We need to protect the dynamic buffer handling.  */
 | |
| __libc_lock_define_initialized (static, lock);
 | |
| 
 | |
| /* This points to the static buffer used.  */
 | |
| static char *buffer;
 | |
| 
 | |
| 
 | |
| LOOKUP_TYPE *
 | |
| FUNCTION_NAME (ADD_PARAMS)
 | |
| {
 | |
|   static size_t buffer_size;
 | |
|   static LOOKUP_TYPE resbuf;
 | |
|   LOOKUP_TYPE *result;
 | |
|   int save;
 | |
| #ifdef NEED_H_ERRNO
 | |
|   int h_errno_tmp = 0;
 | |
| # ifdef HANDLE_DIGITS_DOTS
 | |
|   int *const h_errnop = &h_errno_tmp;;
 | |
| # endif
 | |
| #endif
 | |
| 
 | |
|   /* Get lock.  */
 | |
|   __libc_lock_lock (lock);
 | |
| 
 | |
|   if (buffer == NULL)
 | |
|     {
 | |
|       buffer_size = BUFLEN;
 | |
|       buffer = malloc (buffer_size);
 | |
|     }
 | |
| 
 | |
|   if (buffer != NULL)
 | |
|     {
 | |
| #ifdef HANDLE_DIGITS_DOTS
 | |
|       /* We have to test for the use of IPv6 which can only be done by
 | |
| 	 examining `_res'.  */
 | |
|       if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1)
 | |
| 	{
 | |
| # ifdef NEED_H_ERRNO
 | |
| 	  h_errno_tmp = NETDB_INTERNAL;
 | |
| # endif
 | |
| 	  result = NULL;
 | |
| 	  goto done;
 | |
| 	}
 | |
| # include "digits_dots.c"
 | |
| #endif
 | |
|     }
 | |
| 
 | |
|   while (buffer != NULL
 | |
| 	 && (INTERNAL (REENTRANT_NAME) (ADD_VARIABLES, &resbuf, buffer,
 | |
| 					buffer_size, &result H_ERRNO_VAR)
 | |
| 	     == ERANGE)
 | |
| #ifdef NEED_H_ERRNO
 | |
| 	 && h_errno_tmp == NETDB_INTERNAL
 | |
| #endif
 | |
| 	 )
 | |
|     {
 | |
|       char *new_buf;
 | |
|       buffer_size += BUFLEN;
 | |
|       new_buf = realloc (buffer, buffer_size);
 | |
|       if (new_buf == NULL)
 | |
| 	{
 | |
| 	  /* We are out of memory.  Free the current buffer so that the
 | |
| 	     process gets a chance for a normal termination.  */
 | |
| 	  save = errno;
 | |
| 	  free (buffer);
 | |
| 	  __set_errno (save);
 | |
| 	}
 | |
|       buffer = new_buf;
 | |
|     }
 | |
| 
 | |
|   if (buffer == NULL)
 | |
|     result = NULL;
 | |
| 
 | |
| #ifdef HANDLE_DIGITS_DOTS
 | |
| done:
 | |
| #endif
 | |
|   /* Release lock.  Preserve error value.  */
 | |
|   save = errno;
 | |
|   __libc_lock_unlock (lock);
 | |
|   __set_errno (save);
 | |
| 
 | |
| #ifdef NEED_H_ERRNO
 | |
|   if (h_errno_tmp != 0)
 | |
|     __set_h_errno (h_errno_tmp);
 | |
| #endif
 | |
| 
 | |
|   return result;
 | |
| }
 | |
| 
 | |
| 
 | |
| /* Free all resources if necessary.  */
 | |
| static void __attribute__ ((unused))
 | |
| free_mem (void)
 | |
| {
 | |
|   if (buffer != NULL)
 | |
|     free (buffer);
 | |
| }
 | |
| 
 | |
| text_set_element (__libc_subfreeres, free_mem);
 |