mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-18 02:50:09 +00:00
84384f5b6a
Wed Nov 20 02:04:11 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sigsuspend.c: Make sigsuspend a weak alias of __sigsuspend. * grp/grp.h: Correct comment about POSIX compliance. * pwd/pwd.h: Likewise. * login/utmp.h: Update copyright and pretty-print prototypes. * sysdeps/generic/paths.h: Add _PATH_LASTLOG, _PATH_UTMP and _PATH_WTMP from utmpbits.h. * sysdeps/unix/sysv/linux/paths.h: Likewise. * sysdeps/generic/utmpbits.h: Remove here. * sysdeps/gnu/utmpbits.h: Likewise. * misc/sys/uio.h: Place __BEGIN_DECLS correctly. Pretty-print prototypes. * sysdeps/unix/sysv/linux/sparc/clone.S: New file. Taken from LinuxThreads-0.5. Tue Nov 19 13:43:07 1996 Richard Henderson <rth@tamu.edu> * inet/ether_hton.c: Include <string.h>. * inet/ether_ntoh.c: Likewise. * inet/rexec.c: Get errno, index, getpass, getlogin from headers. * misc/search.h: Fix hcreate_r argument type (unsigned -> size_t). * misc/sys/cdefs.h: Change __long_double_t definition from typedef to define. Jim Nance reports problems building XEmacs otherwise. * resolv/gethnamaddr.c: Protect h_errno redefinition. * resolv/getnetnamadr.c: Likewise. * resolv/herror.c: Likewise. * sysdeps/generic/sigset.h (__SIGSETFN): Operator ## doesn't work with -traditional. Reported by Eric Youngdale. While we're at this, don't do error checking in the __ functions. This is consistent with the sysv4 definitions and seems Right. * signal/signal.h: Don't __OPTIMIZE__ sigops to __ versions. Add prototype for __sigsuspend. * sysdeps/posix/sigblock.c: Optimize sigmask <-> sigset_t conversions for sigset_t == unsigned long. De-ansidecl-ify. Reformat copyright. * sysdeps/posix/sigpause.c: Likewise. * sysdeps/posix/sigsetmask.c: Likewise. * sysdeps/posix/sigvec.c: Likewise. * sysdeps/posix/sigintr.c: Reformat copyright. * sysdeps/posix/signal.c: Check signal number out of range since __sigismember doesn't anymore. Reformat copyright. * sysdeps/posix/sigwait.c: Use __ versions of sigfillset, sigismember, sigdelset, sigaction, and sigsuspend. * stdlib/drand48-iter.c (__drand48_iterate): Cast state fragments to the wider type before shifting. * sysdeps/alpha/bsd-_setjmp.S: Silence assembler warning "$at used without .set noat" in profiling hook. * sysdeps/alpha/bsd-setjmp.S: Likewise. * sysdeps/alpha/htonl.S: Likewise. * sysdeps/alpha/htons.S: Likewise. * sysdeps/alpha/s_copysign.S: Likewise. * sysdeps/alpha/setjmp.S: Likewise. * sysdeps/alpha/stpcpy.S: Likewise. * sysdeps/alpha/strcat.S: Likewise. * sysdeps/alpha/strcpy.S: Likewise. * sysdeps/alpha/strncat.S: Likewise. * sysdeps/unix/sysv/linux/alpha/brk.S: Likewise. * sysdeps/unix/sysv/linux/alpha/clone.S: Likewise. * sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S: Likewise. * sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S: Likewise. * sysdeps/unix/sysv/linux/alpha/llseek.S: Likewise. * sysdeps/unix/sysv/linux/alpha/sigsuspend.S: Likewise. Rename function to __sigsuspend and add weak alias. * sysdeps/unix/sysv/linux/alpha/syscall.S: Likewise. Add missing END. * sysdeps/alpha/w_sqrt.S: Define _ERRNO_H so <errnos.h> defines EDOM. * sysdeps/unix/execve.S: Match PSEUDO_END symbol with the symbol SYSCALL__ actually generated. * sysdeps/unix/sysv/linux/errnos.h [_LIBC_REENTRANT]: Reflexively #define __set_errno, as several imported subsystems (eg. BIND) check that the symbol is defined. * sysdeps/unix/sysv/linux/getsysstats.c: Include <alloca.h>. * sysdeps/alpha/memcpy.S: Temporarily remove until I can find a bug that manifests in GCC. Tue Nov 19 11:10:05 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/posix/writev.c (writev): COUNT parm is now int. * sysdeps/posix/readv.c (readv): Likewise. Tue Nov 19 15:28:29 1996 Ulrich Drepper <drepper@cygnus.com> * nss/nss_dns/dns-network.c: Change return type of all functions to enum nss_status. Reported by NIIBE Yutaka. * nss/nss_dns/dns-host.c: Update copyright. Fri Nov 15 20:16:38 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * config.make.in: Remove definition of top_absdir. * configure.in: Likewise. Use $(..) instead. * Makerules (make-link): Use $(..) to find rellns-sh script. Sat Nov 16 15:52:29 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/nss.texi (Name Service Switch): Fix reference to `frobnicate'. Fri Nov 15 22:08:33 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add sys/mtio.h. Mon Nov 18 05:51:13 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/waitstatus.h (__WIFSIGNALED): Rename local variable from __stat to __status to prevent shadowing. * sunrpc/rpc/clnt.h (clntudp_create, clntudp_bufcreate): Likewise for parameter __wait. Reported by NIIBE Yutaka. Mon Nov 18 02:05:38 1996 Ulrich Drepper <drepper@cygnus.com> * misc/regexp.c: New file. Implementation of obsolete interface to regular expression matcher (required in XPG4.2). * misc/regexp.h: New file. Header for above. * misc/Makefile (headers): Add regexp.h. (routines): Add regexp.c. Update copyright. Sun Nov 17 21:50:24 1996 Andreas Jaeger <aj@arthur.pfalz.de> * stdlib/tst-strtod.c (main): Add arguments for main. * stdlib/tst-strtol.c (main): Likewise. Sun Nov 17 21:15:05 1996 Ulrich Drepper <drepper@cygnus.com> * configure.in: Substitute libc_cv_slibdir and libc_cv_sysconfdir in output files. * sysdepes/unix/sysv/linux/configure: Define libc_cv_slibdir to /lib and sysconfdir to /etc if $prefix is /usr. * config.make.in: Add slibdir, sysconfdir and BASH to be replaced. * elf/Makefile ($(objpfx)ldd): Install ldd.bash.in if $(have-bash2) is yes. * elf/ldd.bash.in: Add copyright and various cleanups. * elf/ldd.sh.in: Likewise. Implement RTLD_NEXT. * elf/dlfcn.h: Define RTLD_NEXT. * elf/dl-deps.c: Build second searchlist which contains duplicates. * elf/dl-lookup.c (_dl_lookup_symbol_skip): New function. Used for RTLD_NEXT lookup. Rewrite _dl_lookup_symbol to put common parts for both lookup functions in a separate function. * elf/dlsym.c: Handle RTLD_NEXT by calling _dl_lookup_symbol_skip. * elf/link.h (struct link_map): Add l_dupsearchlist and l_ndupsearchlist. Add prototype for _dl_lookup_symbol_skip. * sunrpc/Makefile (rpcsvc): Add rusers. * sunrpc/rpcsvc/rnusers.x: Remove. Obsolteted by rusers.x. * sunrpc/rpcsvc/rusers.x: New file. Sun Nov 17 04:24:35 1996 Ulrich Drepper <drepper@cygnus.com> * stdio-common/vfprintf.c [USE_IN_LIBIO] (buffered_vfprintf): Call __libc_lock_init for local lock. Reported by a sun <asun@zoology.washington.edu>. [!USE_IN_LIBIO] (PAD): Optimize a bit.
291 lines
7.9 KiB
C
291 lines
7.9 KiB
C
/* Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
|
|
* Dep. Matematica Universidade de Coimbra, Portugal, Europe
|
|
*
|
|
* 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.
|
|
*/
|
|
/*
|
|
* Copyright (c) 1983, 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.
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char sccsid[] = "@(#)getnetbyaddr.c 8.1 (Berkeley) 6/4/93";
|
|
static char sccsid_[] = "from getnetnamadr.c 1.4 (Coimbra) 93/06/03";
|
|
static char rcsid[] = "$Id$";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/param.h>
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#include <arpa/nameser.h>
|
|
|
|
#include <stdio.h>
|
|
#include <netdb.h>
|
|
#include <resolv.h>
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
|
|
#ifndef h_errno
|
|
extern int h_errno;
|
|
#endif
|
|
|
|
#if defined(mips) && defined(SYSTYPE_BSD43) && !defined(errno)
|
|
extern int errno;
|
|
#endif
|
|
|
|
struct netent *_getnetbyaddr __P((long net, int type));
|
|
struct netent *_getnetbyname __P((const char *name));
|
|
|
|
#define BYADDR 0
|
|
#define BYNAME 1
|
|
#define MAXALIASES 35
|
|
|
|
#if PACKETSZ > 1024
|
|
#define MAXPACKET PACKETSZ
|
|
#else
|
|
#define MAXPACKET 1024
|
|
#endif
|
|
|
|
typedef union {
|
|
HEADER hdr;
|
|
u_char buf[MAXPACKET];
|
|
} querybuf;
|
|
|
|
typedef union {
|
|
long al;
|
|
char ac;
|
|
} align;
|
|
|
|
static struct netent *
|
|
getnetanswer(answer, anslen, net_i)
|
|
querybuf *answer;
|
|
int anslen;
|
|
int net_i;
|
|
{
|
|
|
|
register HEADER *hp;
|
|
register u_char *cp;
|
|
register int n;
|
|
u_char *eom;
|
|
int type, class, buflen, ancount, qdcount, haveanswer, i, nchar;
|
|
char aux1[30], aux2[30], ans[30], *in, *st, *pauxt, *bp, **ap,
|
|
*paux1 = &aux1[0], *paux2 = &aux2[0], flag = 0;
|
|
static struct netent net_entry;
|
|
static char *net_aliases[MAXALIASES], netbuf[BUFSIZ+1];
|
|
|
|
/*
|
|
* find first satisfactory answer
|
|
*
|
|
* answer --> +------------+ ( MESSAGE )
|
|
* | Header |
|
|
* +------------+
|
|
* | Question | the question for the name server
|
|
* +------------+
|
|
* | Answer | RRs answering the question
|
|
* +------------+
|
|
* | Authority | RRs pointing toward an authority
|
|
* | Additional | RRs holding additional information
|
|
* +------------+
|
|
*/
|
|
eom = answer->buf + anslen;
|
|
hp = &answer->hdr;
|
|
ancount = ntohs(hp->ancount); /* #/records in the answer section */
|
|
qdcount = ntohs(hp->qdcount); /* #/entries in the question section */
|
|
bp = netbuf;
|
|
buflen = sizeof(netbuf);
|
|
cp = answer->buf + HFIXEDSZ;
|
|
if (!qdcount) {
|
|
if (hp->aa)
|
|
__set_h_errno (HOST_NOT_FOUND);
|
|
else
|
|
__set_h_errno (TRY_AGAIN);
|
|
return (NULL);
|
|
}
|
|
while (qdcount-- > 0)
|
|
cp += __dn_skipname(cp, eom) + QFIXEDSZ;
|
|
ap = net_aliases;
|
|
*ap = NULL;
|
|
net_entry.n_aliases = net_aliases;
|
|
haveanswer = 0;
|
|
while (--ancount >= 0 && cp < eom) {
|
|
n = dn_expand(answer->buf, eom, cp, bp, buflen);
|
|
if ((n < 0) || !res_dnok(bp))
|
|
break;
|
|
cp += n;
|
|
ans[0] = '\0';
|
|
(void)strcpy(&ans[0], bp);
|
|
GETSHORT(type, cp);
|
|
GETSHORT(class, cp);
|
|
cp += INT32SZ; /* TTL */
|
|
GETSHORT(n, cp);
|
|
if (class == C_IN && type == T_PTR) {
|
|
n = dn_expand(answer->buf, eom, cp, bp, buflen);
|
|
if ((n < 0) || !res_hnok(bp)) {
|
|
cp += n;
|
|
return (NULL);
|
|
}
|
|
cp += n;
|
|
*ap++ = bp;
|
|
bp += strlen(bp) + 1;
|
|
net_entry.n_addrtype =
|
|
(class == C_IN) ? AF_INET : AF_UNSPEC;
|
|
haveanswer++;
|
|
}
|
|
}
|
|
if (haveanswer) {
|
|
*ap = NULL;
|
|
switch (net_i) {
|
|
case BYADDR:
|
|
net_entry.n_name = *net_entry.n_aliases;
|
|
net_entry.n_net = 0L;
|
|
break;
|
|
case BYNAME:
|
|
in = *net_entry.n_aliases;
|
|
net_entry.n_name = &ans[0];
|
|
aux2[0] = '\0';
|
|
for (i = 0; i < 4; i++) {
|
|
for (st = in, nchar = 0;
|
|
*st != '.';
|
|
st++, nchar++)
|
|
;
|
|
if (nchar != 1 || *in != '0' || flag) {
|
|
flag = 1;
|
|
(void)strncpy(paux1,
|
|
(i==0) ? in : in-1,
|
|
(i==0) ?nchar : nchar+1);
|
|
paux1[(i==0) ? nchar : nchar+1] = '\0';
|
|
pauxt = paux2;
|
|
paux2 = strcat(paux1, paux2);
|
|
paux1 = pauxt;
|
|
}
|
|
in = ++st;
|
|
}
|
|
net_entry.n_net = inet_network(paux2);
|
|
break;
|
|
}
|
|
net_entry.n_aliases++;
|
|
return (&net_entry);
|
|
}
|
|
__set_h_errno (TRY_AGAIN);
|
|
return (NULL);
|
|
}
|
|
|
|
struct netent *
|
|
getnetbyaddr(net, net_type)
|
|
register u_long net;
|
|
register int net_type;
|
|
{
|
|
unsigned int netbr[4];
|
|
int nn, anslen;
|
|
querybuf buf;
|
|
char qbuf[MAXDNAME];
|
|
u_int32_t net2; /* Changed from unsigned long --roland */
|
|
struct netent *net_entry;
|
|
|
|
if (net_type != AF_INET)
|
|
return (_getnetbyaddr(net, net_type));
|
|
|
|
for (nn = 4, net2 = net; net2; net2 >>= 8)
|
|
netbr[--nn] = net2 & 0xff;
|
|
switch (nn) {
|
|
case 3: /* Class A */
|
|
sprintf(qbuf, "0.0.0.%u.in-addr.arpa", netbr[3]);
|
|
break;
|
|
case 2: /* Class B */
|
|
sprintf(qbuf, "0.0.%u.%u.in-addr.arpa", netbr[3], netbr[2]);
|
|
break;
|
|
case 1: /* Class C */
|
|
sprintf(qbuf, "0.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
|
|
netbr[1]);
|
|
break;
|
|
case 0: /* Class D - E */
|
|
sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
|
|
netbr[1], netbr[0]);
|
|
break;
|
|
}
|
|
anslen = res_query(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
|
|
if (anslen < 0) {
|
|
#ifdef DEBUG
|
|
if (_res.options & RES_DEBUG)
|
|
printf("res_query failed\n");
|
|
#endif
|
|
if (errno == ECONNREFUSED)
|
|
return (_getnetbyaddr(net, net_type));
|
|
return (NULL);
|
|
}
|
|
net_entry = getnetanswer(&buf, anslen, BYADDR);
|
|
if (net_entry) {
|
|
unsigned u_net = net; /* maybe net should be unsigned ? */
|
|
|
|
/* Strip trailing zeros */
|
|
while ((u_net & 0xff) == 0 && u_net != 0)
|
|
u_net >>= 8;
|
|
net_entry->n_net = u_net;
|
|
return (net_entry);
|
|
}
|
|
return (_getnetbyaddr(net, net_type));
|
|
}
|
|
|
|
struct netent *
|
|
getnetbyname(net)
|
|
register const char *net;
|
|
{
|
|
int anslen;
|
|
querybuf buf;
|
|
char qbuf[MAXDNAME];
|
|
struct netent *net_entry;
|
|
|
|
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
|
|
__set_h_errno (NETDB_INTERNAL);
|
|
return (NULL);
|
|
}
|
|
strcpy(&qbuf[0], net);
|
|
anslen = res_search(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
|
|
if (anslen < 0) {
|
|
#ifdef DEBUG
|
|
if (_res.options & RES_DEBUG)
|
|
printf("res_query failed\n");
|
|
#endif
|
|
if (errno == ECONNREFUSED)
|
|
return (_getnetbyname(net));
|
|
return (_getnetbyname(net));
|
|
}
|
|
net_entry = getnetanswer(&buf, anslen, BYNAME);
|
|
if (net_entry)
|
|
return (net_entry);
|
|
return (_getnetbyname(net));
|
|
}
|