=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/include/netdb.h,v retrieving revision 1.1 retrieving revision 1.2 diff -c -r1.1 -r1.2 *** src/include/netdb.h 1995/10/18 08:41:13 1.1 --- src/include/netdb.h 1996/02/19 19:53:13 1.2 *************** *** 1,8 **** ! /* $NetBSD: netdb.h,v 1.5 1995/07/03 22:59:12 jtc Exp $ */ ! ! /*- ! * Copyright (c) 1980, 1983, 1988 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 --- 1,8 ---- ! /* ! * ++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 *************** *** 31,49 **** * 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. * ! * @(#)netdb.h 5.15 (Berkeley) 4/3/91 */ #ifndef _NETDB_H_ #define _NETDB_H_ #define _PATH_HEQUIV "/etc/hosts.equiv" #define _PATH_HOSTS "/etc/hosts" #define _PATH_NETWORKS "/etc/networks" #define _PATH_PROTOCOLS "/etc/protocols" #define _PATH_SERVICES "/etc/services" /* * Structures returned by network data base library. All addresses are * supplied in host order, and returned in network order (suitable for --- 31,80 ---- * 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: netdb.h,v 8.6 1995/12/03 08:31:12 vixie Exp + */ + #ifndef _NETDB_H_ #define _NETDB_H_ + #include + #if (!defined(BSD)) || (BSD < 199306) + # include + #endif + #include + #define _PATH_HEQUIV "/etc/hosts.equiv" #define _PATH_HOSTS "/etc/hosts" #define _PATH_NETWORKS "/etc/networks" #define _PATH_PROTOCOLS "/etc/protocols" #define _PATH_SERVICES "/etc/services" + 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 *************** *** 60,66 **** /* * Assumption here is that a network number ! * fits in 32 bits -- probably a poor one. */ struct netent { char *n_name; /* official name of net */ --- 91,97 ---- /* * 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 */ *************** *** 87,102 **** * (left in extern int h_errno). */ ! extern int h_errno; ! #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 */ - #include - __BEGIN_DECLS void endhostent __P((void)); void endnetent __P((void)); --- 118,131 ---- * (left in extern int 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 */ __BEGIN_DECLS void endhostent __P((void)); void endnetent __P((void)); *************** *** 104,109 **** --- 133,139 ---- 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((long, int)); /* u_long? */ struct netent *getnetbyname __P((const char *)); *************** *** 115,126 **** struct servent *getservbyport __P((int, const char *)); struct servent *getservent __P((void)); void herror __P((const char *)); ! 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 #endif /* !_NETDB_H_ */ --- 145,170 ---- 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 + + /* This is nec'y to make this include file properly replace the sun version. */ + #ifdef sun + #ifdef __GNU_LIBRARY__ + #include + #else + struct rpcent { + char *r_name; /* name of server for this rpc program */ + char **r_aliases; /* alias list */ + int r_number; /* rpc program number */ + }; + struct rpcent *getrpcbyname(), *getrpcbynumber(), *getrpcent(); + #endif /* __GNU_LIBRARY__ */ + #endif /* sun */ #endif /* !_NETDB_H_ */