aboutsummaryrefslogtreecommitdiff
path: root/resolv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-08-07 23:50:59 +0000
committerUlrich Drepper <drepper@redhat.com>1996-08-07 23:50:59 +0000
commit233963756b2ef272f8876afec2a2bb629b425e0c (patch)
tree69b27a7182cd444f37d08d08a9f64f957cc64ef9 /resolv
parent80776ab80da30197fe7eb34d46f12b397b8ce1d4 (diff)
downloadglibc-233963756b2ef272f8876afec2a2bb629b425e0c.zip
glibc-233963756b2ef272f8876afec2a2bb629b425e0c.tar.gz
glibc-233963756b2ef272f8876afec2a2bb629b425e0c.tar.bz2
Thu Aug 8 01:41:43 1996 Ulrich Drepper <drepper@cygnus.com> * elf/Makefile: Undo change of Tue Aug 6 14:27:11 1996. * elf/dl-support: Add definition of `_dl_sysdep_read_whole_file'. Thu Aug 8 01:15:59 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/fpu_control.h (_FPU_DEFAULT, _FPU_IEEE): Set to 0x137f to allow long double operations. Sun Aug 4 13:12:05 1996 Richard Henderson <rth@tamu.edu> Bug Fixes: * nss/nsswitch.c (_res): Remove redundant variable definition. The real one is in resolve/res_init.c, and having both prevents using -fno-common when building the shared library. * sunrpc/rpc_prot.c (_null_auth): Same. Original is in rpc_common.c. * sysdeps/unix/sysv/linux/alpha/brk.S: When PIC, define __curbrk as a .bss object not a COMMON symbol. * sysdeps/alpha/bsd-_setjmp.S, sysdeps/alpha/bsd-setjmp.S: Must load $gp before referencing __sigsetjmp symbol. Retain LITUSE for same. Optimizations: * sysdeps/alpha/strlen.S: Rearrange first-word setup and thense the main loop for better dual-issue on EV5. Rearrange binary search to pipeline better and trim one instruction. Cosmetic Changes: * time/localtime.c (localtime_r): Move lock declaration back next to the comment where it was before the 960724 change. * INSTALL, manual/maint.texi: alpha-gnu-linux -> alpha-ANYTHING-linux. The second word is supposed to be the hardware manufacturer. * sysdeps/alpha/_mcount.S: Retain LITUSE for __mcount. * sysdeps/alpha/setjmp.S: Retain LITUSE for __sigsetjmp_aux. * sysdeps/alpha/divrem.h: More local labels, retain LITUSE for _mcount. * sysdeps/alpha/alphaev5/add_n.S, sysdeps/alpha/alphaev5/lshift.S, sysdeps/alpha/alphaev5/rshift.S, sysdeps/alpha/alphaev5/sub_n.S: Same cleanups as with EV4 GMP stuff. Tue Jul 25 03:30:56 1996 Richard Henderson <rth@tamu.edu> * sysdeps/unix/sysv/linux/Makefile [misc] (sysdep_routines): Add clone. * sysdeps/unix/sysv/linux/alpha/clone.S: New file. * sysdeps/unix/sysv/linux/i386/clone.S: New file. Sun Aug 4 00:12:41 1996 David Mosberger-Tang <davidm@azstarnet.com> * sysdeps/unix/sysv/linux/gnu/types.h: Declare __fd_mask as `unsigned long'. * misc/sys/select.h: Declare fd_mask as alias of __fd_mask. Sat Aug 3 16:20:02 1996 David Mosberger-Tang <davidm@azstarnet.com> * sysdeps/unix/sysv/linux/alpha/ioperm.c (platform): Add entry for Mikasa. * socket/sys/socket.h (send, __send, sendto): Declare buffer pointer as __const. * string/tester.c (main): Test stpncpy. * sysdeps/generic/stpncpy.c (__stpncpy): Fix so it works without segfault when called with an N that is not a multiple of four and src[N-1]=='\0'. * misc/syslog.c (LogType): New variable. (openlog): If connect() with SOCK_DGRAM fails with EPROTOTYPE, try again with SOCK_STREAM (the Linux syslogd uses a socket of the latter type). (vsyslog): When LogType==SOCK_STREAM, also send ASCII NUL terminator as a record-delimiter. If __send(LogFile) fails, call closelog() so logfile gets re-opened next time. Wed Aug 7 15:15:14 1996 Ulrich Drepper <drepper@cygnus.com> * elf/dl-open (_dl_open): Add cast to avoid warning. * manual/memory.texi: Improve some examples to give readers better advice: Use `stpcpy' instead of `strcat' if possible. * manual/string.texi: Document `strtok_r' and `strtok'. * sunrpc/Makefile: Move `+gccwarn' definition before inclusion of Makeconfig. [$(cross-compiling)=no]: Change test before making librpcsvc to this from $(cross-compile). Reported by Andreas Schwab. Tue Aug 6 14:27:11 1996 Ulrich Drepper <drepper@cygnus.com> * elf/Makefile (routines): Move dl-sysdep to here... (rtld-routines): ...from here. This should make static linking work again. * locale/setlocale.c: Add local variable `lock' and add code to `setlocale' to avoid simultaneous changing of global data. * catgets/catgets.c (catopen): Use `__strdup' instead of `strdup'. * catgets/open_catalog (__open_catalog): Use `__stpcpy', `__open', `__fstat', `__read', `__mmap', `__munmap' and `__close' instead of unprotected names.
Diffstat (limited to 'resolv')
-rw-r--r--resolv/netdb.h447
1 files changed, 298 insertions, 149 deletions
diff --git a/resolv/netdb.h b/resolv/netdb.h
index 38367e3..cca3060 100644
--- a/resolv/netdb.h
+++ b/resolv/netdb.h
@@ -1,72 +1,35 @@
-/*
- * ++Copyright++ 1980, 1983, 1988, 1993
- * -
- * Copyright (c) 1980, 1983, 1988, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-/*
- * @(#)netdb.h 8.1 (Berkeley) 6/2/93
- * $Id$
- */
-
-#ifndef _NETDB_H_
-#define _NETDB_H_
-
-#include <sys/param.h>
-#if (!defined(BSD)) || (BSD < 199306)
-# include <sys/bitypes.h>
-#endif
-#include <sys/cdefs.h>
+/* Copyright (C) 1996 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. */
+
+/* All data returned by the network data base library are supplied in
+ host order and returned in network order (suitable for use in
+ system calls). */
+
+#ifndef _NETDB_H
+
+#define _NETDB_H 1
+#include <features.h>
+
+/* This is necessary to make this include file properly replace the
+ Sun version. */
+#include <rpc/netdb.h>
+
+/* Absolute file name for network data base files. */
#define _PATH_HEQUIV "/etc/hosts.equiv"
#define _PATH_HOSTS "/etc/hosts"
#define _PATH_NETWORKS "/etc/networks"
@@ -74,98 +37,284 @@
#define _PATH_PROTOCOLS "/etc/protocols"
#define _PATH_SERVICES "/etc/services"
+
+__BEGIN_DECLS
+
+/* Error status for non-reentrant lookup functions. */
extern int h_errno;
-/*
- * Structures returned by network data base library. All addresses are
- * supplied in host order, and returned in network order (suitable for
- * use in system calls).
- */
-struct hostent {
- char *h_name; /* official name of host */
- char **h_aliases; /* alias list */
- int h_addrtype; /* host address type */
- int h_length; /* length of address */
- char **h_addr_list; /* list of addresses from name server */
-#define h_addr h_addr_list[0] /* address, for backward compatiblity */
-};
+/* Possible values left in `h_errno'. */
+#define NETDB_INTERNAL -1 /* See errno. */
+#define NETDB_SUCCESS 0 /* No problem. */
+#define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found. */
+#define TRY_AGAIN 2 /* Non-Authoritive Host not found,
+ or SERVERFAIL. */
+#define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED,
+ NOTIMP. */
+#define NO_DATA 4 /* Valid name, no data record of requested
+ type. */
+#define NO_ADDRESS NO_DATA /* No address, look for MX record. */
+
+/* Print error indicated by `h_errno' variable on standard error. STR
+ if non-null is printed before the error string. */
+extern void herror __P ((__const char *__str));
+
+/* Return string associated with error ERR_NUM. */
+extern __const char *hstrerror __P ((int __err_num));
+
-/*
- * Assumption here is that a network number
- * fits in an unsigned long -- probably a poor one.
- */
-struct netent {
- char *n_name; /* official name of net */
- char **n_aliases; /* alias list */
- int n_addrtype; /* net address type */
- unsigned long n_net; /* network # */
+
+/* Description of data base entry for a single host. */
+struct hostent
+{
+ char *h_name; /* Official name of host. */
+ char **h_aliases; /* Alias list. */
+ int h_addrtype; /* Host address type. */
+ int h_length; /* Length of address. */
+ char **h_addr_list; /* List of addresses from name server. */
+#define h_addr h_addr_list[0] /* Address, for backward compatiblity. */
};
-struct servent {
- char *s_name; /* official service name */
- char **s_aliases; /* alias list */
- int s_port; /* port # */
- char *s_proto; /* protocol to use */
+/* Open host data base files and mark them as staying open even after
+ a later search if STAY_OPEN is non-zero. */
+extern void sethostent __P ((int __stay_open));
+
+/* Close host data base files and clear `stay open' flag. */
+extern void endhostent __P ((void));
+
+/* Get next entry from host data base file. Open data base if
+ necessary. */
+extern struct hostent *gethostent __P ((void));
+
+/* Return entry from host data base which address match ADDR with
+ length LEN and type TYPE. */
+extern struct hostent *gethostbyaddr __P ((__const char *__addr, int __len,
+ int __type));
+
+/* Return entry from host data base for host with NAME. */
+extern struct hostent *gethostbyname __P ((__const char *__name));
+
+/* Return entry from host data base for host with NAME. AF must be
+ set to the address type which as `AF_INET' for IPv4 or `AF_INET6'
+ for IPv6. */
+extern struct hostent *gethostbyname2 __P ((__const char *__name, int __af));
+
+#ifdef __USE_REENTRANT
+/* Reentrant versions of the functions above. The additional
+ arguments specify a buffer of BUFLEN starting at BUF. The last
+ argument is a pointer to a variable which gets the value which
+ would be stored in the global variable `herrno' by the
+ non-reentrant functions. */
+extern struct hostent *__gethostent_r __P ((struct hostent *__result_buf,
+ char *__buf, int __buf_len,
+ int *__h_errnop));
+extern struct hostent *gethostent_r __P ((struct hostent *__result_buf,
+ char *__buf, int __buf_len,
+ int *__h_errnop));
+
+extern struct hostent *__gethostbyaddr_r __P ((__const char *__addr, int __len,
+ int __type,
+ struct hostent *__result_buf,
+ char *__buf, int __buflen,
+ int *__h_errnop));
+extern struct hostent *gethostbyaddr_r __P ((__const char *__addr, int __len,
+ int __type,
+ struct hostent *__result_buf,
+ char *__buf, int __buflen,
+ int *__h_errnop));
+
+extern struct hostent *__gethostbyname_r __P ((__const char *__name,
+ struct hostent *__result_buf,
+ char *__buf, int __buflen,
+ int *__h_errnop));
+extern struct hostent *gethostbyname_r __P ((__const char *__name,
+ struct hostent *__result_buf,
+ char *__buf, int __buflen,
+ int *__h_errnop));
+
+extern struct hostent *__gethostbyname2_r __P ((__const char *__name, int __af,
+ struct hostent *__result_buf,
+ char *__buf, int __buflen,
+ int *__h_errnop));
+extern struct hostent *gethostbyname2_r __P ((__const char *__name, int __af,
+ struct hostent *__result_buf,
+ char *__buf, int __buflen,
+ int *__h_errnop));
+#endif /* reentrant */
+
+
+/* Description of data base entry for a single network. NOTE: here a
+ poor assumption is made. The network number is expected to fit
+ into an unsigned long int variable. */
+struct netent
+{
+ char *n_name; /* Official name of network. */
+ char **n_aliases; /* Alias list. */
+ int n_addrtype; /* Net address type. */
+ unsigned long int n_net; /* Network number. */
};
-struct protoent {
- char *p_name; /* official protocol name */
- char **p_aliases; /* alias list */
- int p_proto; /* protocol # */
+/* Open network data base files and mark them as staying open even
+ after a later search if STAY_OPEN is non-zero. */
+extern void setnetent __P ((int __stay_open));
+
+/* Close network data base files and clear `stay open' flag. */
+extern void endnetent __P ((void));
+
+/* Get next entry from network data base file. Open data base if
+ necessary. */
+extern struct netent *getnetent __P ((void));
+
+/* Return entry from network data base which address match NET and
+ type TYPE. */
+extern struct netent *getnetbyaddr __P ((unsigned long int __net,
+ int __type));
+
+/* Return entry from network data base for network with NAME. */
+extern struct netent *getnetbyname __P ((__const char *__name));
+
+#ifdef __USE_REENTRANT
+/* Reentrant versions of the functions above. The additional
+ arguments specify a buffer of BUFLEN starting at BUF. The last
+ argument is a pointer to a variable which gets the value which
+ would be stored in the global variable `herrno' by the
+ non-reentrant functions. */
+extern struct netent *__getnetent_r __P ((struct netent *__result_buf,
+ char *__buf, int __buf_len,
+ int *__h_errnop));
+extern struct netent *getnetent_r __P ((struct netent *__result_buf,
+ char *__buf, int __buf_len,
+ int *__h_errnop));
+
+extern struct netent *__getnetbyaddr_r __P ((unsigned long int __net,
+ int __type,
+ struct netent *__result_buf,
+ char *__buf, int __buflen,
+ int *__h_errnop));
+extern struct netent *getnetbyaddr_r __P ((unsigned long int __net,
+ int __type,
+ struct netent *__result_buf,
+ char *__buf, int __buflen,
+ int *__h_errnop));
+
+extern struct netent *__getnetbyname_r __P ((__const char *__name,
+ struct netent *__result_buf,
+ char *__buf, int __buflen,
+ int *__h_errnop));
+extern struct netent *getnetbyname_r __P ((__const char *__name,
+ struct netent *__result_buf,
+ char *__buf, int __buflen,
+ int *__h_errnop));
+#endif /* reentrant */
+
+
+/* Description of data base entry for a single service. */
+struct servent
+{
+ char *s_name; /* Official service name. */
+ char **s_aliases; /* Alias list. */
+ int s_port; /* Port number. */
+ char *s_proto; /* Protocol to use. */
};
-/*
- * Error return codes from gethostbyname() and gethostbyaddr()
- * (left in extern int h_errno).
- */
+/* Open service data base files and mark them as staying open even
+ after a later search if STAY_OPEN is non-zero. */
+extern void setservent __P ((int __stay_open));
-#define NETDB_INTERNAL -1 /* see errno */
-#define NETDB_SUCCESS 0 /* no problem */
-#define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found */
-#define TRY_AGAIN 2 /* Non-Authoritive Host not found, or SERVERFAIL */
-#define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
-#define NO_DATA 4 /* Valid name, no data record of requested type */
-#define NO_ADDRESS NO_DATA /* no address, look for MX record */
+/* Close service data base files and clear `stay open' flag. */
+extern void endservent __P ((void));
-__BEGIN_DECLS
-void endhostent __P((void));
-void endnetent __P((void));
-void endprotoent __P((void));
-void endservent __P((void));
-struct hostent *gethostbyaddr __P((const char *, int, int));
-struct hostent *gethostbyname __P((const char *));
-struct hostent *gethostbyname2 __P((const char *, int));
-struct hostent *gethostent __P((void));
-struct netent *getnetbyaddr __P((unsigned long, int));
-struct netent *getnetbyname __P((const char *));
-struct netent *getnetent __P((void));
-struct protoent *getprotobyname __P((const char *));
-struct protoent *getprotobynumber __P((int));
-struct protoent *getprotoent __P((void));
-struct servent *getservbyname __P((const char *, const char *));
-struct servent *getservbyport __P((int, const char *));
-struct servent *getservent __P((void));
-void herror __P((const char *));
-const char *hstrerror __P((int));
-void sethostent __P((int));
-/* void sethostfile __P((const char *)); */
-void setnetent __P((int));
-void setprotoent __P((int));
-void setservent __P((int));
-__END_DECLS
+/* Get next entry from service data base file. Open data base if
+ necessary. */
+extern struct servent *getservent __P ((void));
-/* This is nec'y to make this include file properly replace the sun version. */
-#ifdef __GNU_LIBRARY__
-#include <rpc/netdb.h>
-#else
-#ifdef sun
-struct rpcent {
- char *r_name; /* name of server for this rpc program */
- char **r_aliases; /* alias list */
- int r_number; /* rpc program number */
+/* Return entry from network data base for network with NAME and
+ protocol PROTO. */
+extern struct servent *getservbyname __P ((__const char *__name,
+ __const char *__proto));
+
+/* Return entry from service data base which matches port PORT and
+ protocol PROTO. */
+extern struct servent *getservbyport __P ((int __port, __const char *__proto));
+
+
+#ifdef __USE_REENTRANT
+/* Reentrant versions of the functions above. The additional
+ arguments specify a buffer of BUFLEN starting at BUF. */
+extern struct servent *__getservent_r __P ((struct servent *__result_buf,
+ char *__buf, int __buf_len));
+extern struct servent *getservent_r __P ((struct servent *__result_buf,
+ char *__buf, int __buf_len));
+
+extern struct servent *__getservbyname_r __P ((__const char *__name,
+ __const char *__proto,
+ struct servent *__result_buf,
+ char *__buf, int __buflen));
+extern struct servent *getservbyname_r __P ((__const char *__name,
+ __const char *__proto,
+ struct servent *__result_buf,
+ char *__buf, int __buflen));
+
+extern struct servent *__getservbyport_r __P ((int __port,
+ __const char *__proto,
+ struct servent *__result_buf,
+ char *__buf, int __buflen));
+extern struct servent *getservbyport_r __P ((int __port, __const char *__proto,
+ struct servent *__result_buf,
+ char *__buf, int __buflen));
+#endif /* reentrant */
+
+
+/* Description of data base entry for a single service. */
+struct protoent
+{
+ char *p_name; /* Official protocol name. */
+ char **p_aliases; /* Alias list. */
+ int p_proto; /* Protocol number. */
};
-struct rpcent *getrpcbyname(), *getrpcbynumber(), *getrpcent();
-#endif /* sun */
-#endif /* __GNU_LIBRARY__ */
-#endif /* !_NETDB_H_ */
+/* Open protocol data base files and mark them as staying open even
+ after a later search if STAY_OPEN is non-zero. */
+extern void setprotoent __P ((int __stay_open));
+
+/* Close protocol data base files and clear `stay open' flag. */
+extern void endprotoent __P ((void));
+
+/* Get next entry from protocol data base file. Open data base if
+ necessary. */
+extern struct protoent *getprotoent __P ((void));
+
+/* Return entry from protocol data base for network with NAME. */
+extern struct protoent *getprotobyname __P ((__const char *__name));
+
+/* Return entry from protocol data base which number is PROTO. */
+extern struct protoent *getprotobynumber __P ((int __proto));
+
+
+#ifdef __USE_REENTRANT
+/* Reentrant versions of the functions above. The additional
+ arguments specify a buffer of BUFLEN starting at BUF. */
+extern struct protoent *__getprotoent_r __P ((struct protoent *__result_buf,
+ char *__buf, int __buf_len));
+extern struct protoent *getprotoent_r __P ((struct protoent *__result_buf,
+ char *__buf, int __buf_len));
+
+extern struct protoent *__getprotobyname_r __P ((__const char *__name,
+ struct protoent *__result_buf,
+ char *__buf, int __buflen));
+extern struct protoent *getprotobyname_r __P ((__const char *__name,
+ struct protoent *__result_buf,
+ char *__buf, int __buflen));
+
+extern struct protoent *__getprotobynumber_r __P ((int __proto,
+ struct protoent *__res_buf,
+ char *__buf, int __buflen));
+extern struct protoent *getprotobynumber_r __P ((int __proto,
+ struct protoent *__result_buf,
+ char *__buf, int __buflen));
+#endif /* reentrant */
+
+
+__END_DECLS
+
+#endif /* netdb.h */