This commit was manufactured by cvs2svn to create tag 'newlib-1_16_0'.newlib-1_16_0

Sprout from binutils-arc-20080908-branch 2008-09-04 20:26:19 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'binutils-'
Cherrypick from master 2007-12-19 22:36:48 UTC Jeff Johnston <jjohnstn@redhat.com> '':
    ChangeLog
    MAINTAINERS
    Makefile.def
    Makefile.in
    Makefile.tpl
    config.guess
    config.rpath
    config.sub
    config/ChangeLog
    config/acinclude.m4
    config/acx.m4
    config/confsubdir.m4
    config/mh-i370pic
    config/mh-ia64pic
    config/mh-mingw
    config/mh-ppc-darwin
    config/mh-s390pic
    config/mh-sparcpic
    config/mt-mips-elfoabi
    config/mt-spu
    config/tls.m4
    configure
    configure.ac
    libgloss/ChangeLog
    libgloss/arm/configure
    libgloss/arm/crt0.S
    libgloss/arm/redboot-syscalls.c
    libgloss/bfin/Makefile.in
    libgloss/bfin/configure
    libgloss/bfin/syscalls.c
    libgloss/configure
    libgloss/cris/configure
    libgloss/cris/gensyscalls
    libgloss/crx/configure
    libgloss/d30v/configure
    libgloss/doc/configure
    libgloss/fr30/configure
    libgloss/fr30/syscalls.c
    libgloss/frv/configure
    libgloss/frv/crt0.S
    libgloss/frv/isatty.c
    libgloss/hp74x/configure
    libgloss/i386/configure
    libgloss/i960/configure
    libgloss/iq2000/configure
    libgloss/iq2000/crt0.S
    libgloss/iq2000/isatty.c
    libgloss/libnosys/configure
    libgloss/libnosys/configure.in
    libgloss/libnosys/isatty.c
    libgloss/m32c/configure
    libgloss/m32c/exit.S
    libgloss/m32r/configure
    libgloss/m32r/isatty.c
    libgloss/m68hc11/configure
    libgloss/m68k/cf-crt1.c
    libgloss/m68k/configure
    libgloss/mcore/configure
    libgloss/mep/configure
    libgloss/mips/configure
    libgloss/mn10200/configure
    libgloss/mn10200/isatty.c
    libgloss/mn10300/configure
    libgloss/mn10300/crt0.S
    libgloss/mn10300/isatty.c
    libgloss/mt/configure
    libgloss/pa/configure
    libgloss/rs6000/configure
    libgloss/sparc/configure
    libgloss/sparc/libsys/configure
    libgloss/spu/Makefile.in
    libgloss/spu/configure
    libgloss/spu/readlink.c
    libgloss/spu/sbrk.c
    libgloss/spu/syscalls.c
    libgloss/wince/configure
    libgloss/xstormy16/configure
    libtool.m4
    ltsugar.m4
    newlib/ChangeLog
    newlib/Makefile.am
    newlib/Makefile.in
    newlib/configure.host
    newlib/libc/argz/argz_count.c
    newlib/libc/argz/argz_extract.c
    newlib/libc/argz/argz_stringify.c
    newlib/libc/ctype/ctype_.c
    newlib/libc/ctype/isalnum.c
    newlib/libc/ctype/isalpha.c
    newlib/libc/ctype/iscntrl.c
    newlib/libc/ctype/isdigit.c
    newlib/libc/ctype/islower.c
    newlib/libc/ctype/isprint.c
    newlib/libc/ctype/ispunct.c
    newlib/libc/ctype/isspace.c
    newlib/libc/ctype/isupper.c
    newlib/libc/ctype/isxdigit.c
    newlib/libc/include/_ansi.h
    newlib/libc/include/_syslist.h
    newlib/libc/include/assert.h
    newlib/libc/include/ctype.h
    newlib/libc/include/getopt.h
    newlib/libc/include/machine/_default_types.h
    newlib/libc/include/machine/ieeefp.h
    newlib/libc/include/machine/setjmp.h
    newlib/libc/include/math.h
    newlib/libc/include/reent.h
    newlib/libc/include/stdint.h
    newlib/libc/include/stdio.h
    newlib/libc/include/string.h
    newlib/libc/include/sys/_default_fcntl.h
    newlib/libc/include/sys/reent.h
    newlib/libc/include/sys/stat.h
    newlib/libc/include/sys/unistd.h
    newlib/libc/libc.texinfo
    newlib/libc/machine/arm/setjmp.S
    newlib/libc/machine/configure
    newlib/libc/machine/i386/memchr.S
    newlib/libc/machine/i386/memset.S
    newlib/libc/machine/i386/strchr.S
    newlib/libc/machine/i386/strlen.S
    newlib/libc/machine/m68k/memcpy.S
    newlib/libc/machine/m68k/memset.S
    newlib/libc/machine/m68k/setjmp.S
    newlib/libc/machine/mips/strncpy.c
    newlib/libc/machine/mn10300/memset.S
    newlib/libc/machine/powerpc/vfprintf.c
    newlib/libc/machine/spu/Makefile.am
    newlib/libc/machine/spu/Makefile.in
    newlib/libc/machine/spu/fprintf.S
    newlib/libc/machine/spu/fscanf.S
    newlib/libc/machine/spu/mk_syscalls
    newlib/libc/machine/spu/printf.S
    newlib/libc/machine/spu/scanf.S
    newlib/libc/machine/spu/setjmp.S
    newlib/libc/machine/spu/snprintf.S
    newlib/libc/machine/spu/sprintf.S
    newlib/libc/machine/spu/sscanf.S
    newlib/libc/machine/spu/stack_reg_va.S
    newlib/libc/machine/spu/strcat.c
    newlib/libc/machine/spu/strcpy.c
    newlib/libc/machine/spu/strlen.c
    newlib/libc/machine/spu/strncat.c
    newlib/libc/machine/spu/strncmp.c
    newlib/libc/machine/spu/strncpy.c
    newlib/libc/machine/spu/sys/dirent.h
    newlib/libc/machine/spu/sys/errno.h
    newlib/libc/machine/spu/sys/sched.h
    newlib/libc/machine/spu/sys/syscall.h
    newlib/libc/posix/Makefile.am
    newlib/libc/posix/Makefile.in
    newlib/libc/posix/isatty.c
    newlib/libc/reent/Makefile.am
    newlib/libc/reent/Makefile.in
    newlib/libc/search/hash.h
    newlib/libc/stdio/Makefile.am
    newlib/libc/stdio/Makefile.in
    newlib/libc/stdio/asiprintf.c
    newlib/libc/stdio/asniprintf.c
    newlib/libc/stdio/asnprintf.c
    newlib/libc/stdio/asprintf.c
    newlib/libc/stdio/dprintf.c
    newlib/libc/stdio/fflush.c
    newlib/libc/stdio/freopen.c
    newlib/libc/stdio/ftell.c
    newlib/libc/stdio/local.h
    newlib/libc/stdio/makebuf.c
    newlib/libc/stdio/rget.c
    newlib/libc/stdio/siprintf.c
    newlib/libc/stdio/siscanf.c
    newlib/libc/stdio/sniprintf.c
    newlib/libc/stdio/snprintf.c
    newlib/libc/stdio/sprintf.c
    newlib/libc/stdio/sscanf.c
    newlib/libc/stdio/vasiprintf.c
    newlib/libc/stdio/vasniprintf.c
    newlib/libc/stdio/vasnprintf.c
    newlib/libc/stdio/vasprintf.c
    newlib/libc/stdio/vdiprintf.c
    newlib/libc/stdio/vdprintf.c
    newlib/libc/stdio/vfprintf.c
    newlib/libc/stdio/vfscanf.c
    newlib/libc/stdio/vsiprintf.c
    newlib/libc/stdio/vsiscanf.c
    newlib/libc/stdio/vsniprintf.c
    newlib/libc/stdio/vsnprintf.c
    newlib/libc/stdio/vsprintf.c
    newlib/libc/stdio/vsscanf.c
    newlib/libc/stdio64/ftello64.c
    newlib/libc/stdlib/envlock.h
    newlib/libc/stdlib/gdtoa-hexnan.c
    newlib/libc/stdlib/getopt.c
    newlib/libc/stdlib/mprec.h
    newlib/libc/stdlib/strtod.c
    newlib/libc/stdlib/wcsrtombs.c
    newlib/libc/string/Makefile.am
    newlib/libc/string/Makefile.in
    newlib/libc/string/memchr.c
    newlib/libc/string/memset.c
    newlib/libc/string/strcasestr.c
    newlib/libc/string/strchr.c
    newlib/libc/string/strings.tex
    newlib/libc/string/strlen.c
    newlib/libc/string/strstr.c
    newlib/libc/sys/a29khif/_isatty.S
    newlib/libc/sys/arc/isatty.c
    newlib/libc/sys/arm/syscalls.c
    newlib/libc/sys/configure
    newlib/libc/sys/d10v/syscalls.c
    newlib/libc/sys/h8300hms/syscalls.c
    newlib/libc/sys/h8500hms/syscalls.c
    newlib/libc/sys/linux/Makefile.am
    newlib/libc/sys/linux/Makefile.in
    newlib/libc/sys/linux/bits/libc-lock.h
    newlib/libc/sys/linux/iconv/iconvconfig.c
    newlib/libc/sys/linux/iconv/strtab.c
    newlib/libc/sys/linux/include/arpa/nameser.h
    newlib/libc/sys/linux/include/hesiod.h
    newlib/libc/sys/linux/include/libc_private.h
    newlib/libc/sys/linux/include/net/ethernet.h
    newlib/libc/sys/linux/include/net/if_atm.h
    newlib/libc/sys/linux/include/net/if_media.h
    newlib/libc/sys/linux/include/net/if_ppp.h
    newlib/libc/sys/linux/include/net/if_pppvar.h
    newlib/libc/sys/linux/include/netdb.h
    newlib/libc/sys/linux/include/netinet/if_atm.h
    newlib/libc/sys/linux/include/netinet/if_ether.h
    newlib/libc/sys/linux/include/netinet/ip_flow.h
    newlib/libc/sys/linux/include/nsswitch.h
    newlib/libc/sys/linux/include/resolv.h
    newlib/libc/sys/linux/include/sched.h
    newlib/libc/sys/linux/include/stdint.h
    newlib/libc/sys/linux/intl/locale.alias
    newlib/libc/sys/linux/libc-symbols.h
    newlib/libc/sys/linux/machine/i386/get_clockfreq.c
    newlib/libc/sys/linux/machine/i386/include/endian.h
    newlib/libc/sys/linux/machine/i386/include/param.h
    newlib/libc/sys/linux/net/Makefile.am
    newlib/libc/sys/linux/net/Makefile.in
    newlib/libc/sys/linux/net/addr2ascii.3
    newlib/libc/sys/linux/net/base64.c
    newlib/libc/sys/linux/net/bindresvport.c
    newlib/libc/sys/linux/net/byteorder.3
    newlib/libc/sys/linux/net/ether_addr.c
    newlib/libc/sys/linux/net/ethers.3
    newlib/libc/sys/linux/net/getaddrinfo.3
    newlib/libc/sys/linux/net/getaddrinfo.c
    newlib/libc/sys/linux/net/gethostbydns.c
    newlib/libc/sys/linux/net/gethostbyht.c
    newlib/libc/sys/linux/net/gethostbyname.3
    newlib/libc/sys/linux/net/gethostbynis.c
    newlib/libc/sys/linux/net/gethostnamadr.c
    newlib/libc/sys/linux/net/getifaddrs.3
    newlib/libc/sys/linux/net/getifaddrs.c
    newlib/libc/sys/linux/net/getipnodebyname.3
    newlib/libc/sys/linux/net/getnameinfo.3
    newlib/libc/sys/linux/net/getnameinfo.c
    newlib/libc/sys/linux/net/getnetbydns.c
    newlib/libc/sys/linux/net/getnetbyht.c
    newlib/libc/sys/linux/net/getnetbynis.c
    newlib/libc/sys/linux/net/getnetent.3
    newlib/libc/sys/linux/net/getnetnamadr.c
    newlib/libc/sys/linux/net/getproto.c
    newlib/libc/sys/linux/net/getprotoent.3
    newlib/libc/sys/linux/net/getprotoent.c
    newlib/libc/sys/linux/net/getprotoname.c
    newlib/libc/sys/linux/net/getservbyname.c
    newlib/libc/sys/linux/net/getservbyport.c
    newlib/libc/sys/linux/net/getservent.3
    newlib/libc/sys/linux/net/getservent.c
    newlib/libc/sys/linux/net/herror.c
    newlib/libc/sys/linux/net/hesiod.3
    newlib/libc/sys/linux/net/hesiod.c
    newlib/libc/sys/linux/net/if_indextoname.3
    newlib/libc/sys/linux/net/inet.3
    newlib/libc/sys/linux/net/inet6_option_space.3
    newlib/libc/sys/linux/net/inet6_rthdr_space.3
    newlib/libc/sys/linux/net/inet_lnaof.c
    newlib/libc/sys/linux/net/inet_makeaddr.c
    newlib/libc/sys/linux/net/inet_net.3
    newlib/libc/sys/linux/net/inet_netof.c
    newlib/libc/sys/linux/net/inet_network.c
    newlib/libc/sys/linux/net/inet_ntoa.c
    newlib/libc/sys/linux/net/innetgr-stub.c
    newlib/libc/sys/linux/net/ip6opt.c
    newlib/libc/sys/linux/net/iso_addr.3
    newlib/libc/sys/linux/net/iso_addr.c
    newlib/libc/sys/linux/net/linkaddr.3
    newlib/libc/sys/linux/net/linkaddr.c
    newlib/libc/sys/linux/net/map_v4v6.c
    newlib/libc/sys/linux/net/name6.c
    newlib/libc/sys/linux/net/namespace.h
    newlib/libc/sys/linux/net/ns.3
    newlib/libc/sys/linux/net/ns_addr.c
    newlib/libc/sys/linux/net/ns_name.c
    newlib/libc/sys/linux/net/ns_netint.c
    newlib/libc/sys/linux/net/ns_ntoa.c
    newlib/libc/sys/linux/net/ns_parse.c
    newlib/libc/sys/linux/net/ns_print.c
    newlib/libc/sys/linux/net/ns_ttl.c
    newlib/libc/sys/linux/net/nsap_addr.c
    newlib/libc/sys/linux/net/nsdispatch.3
    newlib/libc/sys/linux/net/nsdispatch.c
    newlib/libc/sys/linux/net/nslexer.c
    newlib/libc/sys/linux/net/nslexer.l
    newlib/libc/sys/linux/net/nsparser.c
    newlib/libc/sys/linux/net/nsparser.h
    newlib/libc/sys/linux/net/nsparser.y
    newlib/libc/sys/linux/net/rcmd.3
    newlib/libc/sys/linux/net/rcmd.c
    newlib/libc/sys/linux/net/rcmdsh.3
    newlib/libc/sys/linux/net/res_comp.c
    newlib/libc/sys/linux/net/res_config.h
    newlib/libc/sys/linux/net/res_data.c
    newlib/libc/sys/linux/net/res_debug.c
    newlib/libc/sys/linux/net/res_init.c
    newlib/libc/sys/linux/net/res_mkquery.c
    newlib/libc/sys/linux/net/res_mkupdate.c
    newlib/libc/sys/linux/net/res_query.c
    newlib/libc/sys/linux/net/res_send.c
    newlib/libc/sys/linux/net/res_update.c
    newlib/libc/sys/linux/net/resolver.3
    newlib/libc/sys/linux/net/rthdr.c
    newlib/libc/sys/linux/net/send.c
    newlib/libc/sys/linux/net/vars.c
    newlib/libc/sys/linux/stdlib/COPYRIGHT
    newlib/libc/sys/linux/stdlib/Makefile.am
    newlib/libc/sys/linux/stdlib/Makefile.in
    newlib/libc/sys/linux/stdlib/cclass.h
    newlib/libc/sys/linux/stdlib/cname.h
    newlib/libc/sys/linux/stdlib/collate.c
    newlib/libc/sys/linux/stdlib/collate.h
    newlib/libc/sys/linux/stdlib/collcmp.c
    newlib/libc/sys/linux/stdlib/engine.c
    newlib/libc/sys/linux/stdlib/fnmatch.3
    newlib/libc/sys/linux/stdlib/fnmatch.c
    newlib/libc/sys/linux/stdlib/glob.3
    newlib/libc/sys/linux/stdlib/glob.c
    newlib/libc/sys/linux/stdlib/reallocf.c
    newlib/libc/sys/linux/stdlib/regcomp.c
    newlib/libc/sys/linux/stdlib/regerror.c
    newlib/libc/sys/linux/stdlib/regex.3
    newlib/libc/sys/linux/stdlib/regex2.h
    newlib/libc/sys/linux/stdlib/regexec.c
    newlib/libc/sys/linux/stdlib/regfree.c
    newlib/libc/sys/linux/stdlib/utils.h
    newlib/libc/sys/linux/stdlib/wordexp.c
    newlib/libc/sys/linux/stdlib/wordfree.c
    newlib/libc/sys/linux/sys/ioctl.h
    newlib/libc/sys/linux/sys/socket.h
    newlib/libc/sys/linux/sys/types.h
    newlib/libc/sys/linux/sys/unistd.h
    newlib/libc/sys/mmixware/isatty.c
    newlib/libc/sys/sh/syscalls.c
    newlib/libc/sys/sysnecv850/crt0.S
    newlib/libc/sys/sysnecv850/isatty.c
    newlib/libc/syscalls/Makefile.am
    newlib/libc/syscalls/Makefile.in
    newlib/libc/syscalls/sysclose.c
    newlib/libc/syscalls/sysexecve.c
    newlib/libc/syscalls/sysfcntl.c
    newlib/libc/syscalls/sysfork.c
    newlib/libc/syscalls/sysfstat.c
    newlib/libc/syscalls/sysgetpid.c
    newlib/libc/syscalls/sysgettod.c
    newlib/libc/syscalls/syskill.c
    newlib/libc/syscalls/syslink.c
    newlib/libc/syscalls/syslseek.c
    newlib/libc/syscalls/sysopen.c
    newlib/libc/syscalls/sysread.c
    newlib/libc/syscalls/syssbrk.c
    newlib/libc/syscalls/sysstat.c
    newlib/libc/syscalls/systimes.c
    newlib/libc/syscalls/sysunlink.c
    newlib/libc/syscalls/syswait.c
    newlib/libc/syscalls/syswrite.c
    newlib/libc/time/mktime.c
    newlib/libm/libm.texinfo
    newlib/libm/machine/spu/configure
    newlib/libm/machine/spu/headers/acosd2.h
    newlib/libm/machine/spu/headers/acosf4.h
    newlib/libm/machine/spu/headers/acoshd2.h
    newlib/libm/machine/spu/headers/acoshf4.h
    newlib/libm/machine/spu/headers/asind2.h
    newlib/libm/machine/spu/headers/asinf4.h
    newlib/libm/machine/spu/headers/asinhd2.h
    newlib/libm/machine/spu/headers/asinhf4.h
    newlib/libm/machine/spu/headers/atan2d2.h
    newlib/libm/machine/spu/headers/atan2f4.h
    newlib/libm/machine/spu/headers/atand2.h
    newlib/libm/machine/spu/headers/atanf4.h
    newlib/libm/machine/spu/headers/atanhd2.h
    newlib/libm/machine/spu/headers/atanhf4.h
    newlib/libm/machine/spu/headers/cbrt.h
    newlib/libm/machine/spu/headers/cbrtf.h
    newlib/libm/machine/spu/headers/cos_sin.h
    newlib/libm/machine/spu/headers/cosd2.h
    newlib/libm/machine/spu/headers/cosf4.h
    newlib/libm/machine/spu/headers/coshd2.h
    newlib/libm/machine/spu/headers/coshf4.h
    newlib/libm/machine/spu/headers/divd2.h
    newlib/libm/machine/spu/headers/divf4.h
    newlib/libm/machine/spu/headers/erf_utils.h
    newlib/libm/machine/spu/headers/erfcd2.h
    newlib/libm/machine/spu/headers/erfcf4.h
    newlib/libm/machine/spu/headers/erfd2.h
    newlib/libm/machine/spu/headers/erff4.h
    newlib/libm/machine/spu/headers/exp2d2.h
    newlib/libm/machine/spu/headers/exp2f4.h
    newlib/libm/machine/spu/headers/expd2.h
    newlib/libm/machine/spu/headers/expf4.h
    newlib/libm/machine/spu/headers/expm1d2.h
    newlib/libm/machine/spu/headers/expm1f4.h
    newlib/libm/machine/spu/headers/floord2.h
    newlib/libm/machine/spu/headers/floorf4.h
    newlib/libm/machine/spu/headers/hypotd2.h
    newlib/libm/machine/spu/headers/hypotf4.h
    newlib/libm/machine/spu/headers/isnand2.h
    newlib/libm/machine/spu/headers/isnanf4.h
    newlib/libm/machine/spu/headers/ldexpd2.h
    newlib/libm/machine/spu/headers/ldexpf4.h
    newlib/libm/machine/spu/headers/lgammad2.h
    newlib/libm/machine/spu/headers/lgammaf4.h
    newlib/libm/machine/spu/headers/log10d2.h
    newlib/libm/machine/spu/headers/log1pd2.h
    newlib/libm/machine/spu/headers/log1pf4.h
    newlib/libm/machine/spu/headers/log2d2.h
    newlib/libm/machine/spu/headers/log2f4.h
    newlib/libm/machine/spu/headers/logbf4.h
    newlib/libm/machine/spu/headers/logd2.h
    newlib/libm/machine/spu/headers/logf4.h
    newlib/libm/machine/spu/headers/nearbyintf4.h
    newlib/libm/machine/spu/headers/nextafterd2.h
    newlib/libm/machine/spu/headers/nextafterf4.h
    newlib/libm/machine/spu/headers/powd2.h
    newlib/libm/machine/spu/headers/powf4.h
    newlib/libm/machine/spu/headers/recipd2.h
    newlib/libm/machine/spu/headers/recipf4.h
    newlib/libm/machine/spu/headers/rintf4.h
    newlib/libm/machine/spu/headers/scalbnf4.h
    newlib/libm/machine/spu/headers/signbitd2.h
    newlib/libm/machine/spu/headers/simdmath.h
    newlib/libm/machine/spu/headers/sincosd2.h
    newlib/libm/machine/spu/headers/sincosf4.h
    newlib/libm/machine/spu/headers/sind2.h
    newlib/libm/machine/spu/headers/sinf4.h
    newlib/libm/machine/spu/headers/sinhd2.h
    newlib/libm/machine/spu/headers/sinhf4.h
    newlib/libm/machine/spu/headers/sqrtd2.h
    newlib/libm/machine/spu/headers/sqrtf4.h
    newlib/libm/machine/spu/headers/tand2.h
    newlib/libm/machine/spu/headers/tanf4.h
    newlib/libm/machine/spu/headers/tanhd2.h
    newlib/libm/machine/spu/headers/tanhf4.h
    newlib/libm/machine/spu/headers/tgammad2.h
    newlib/libm/machine/spu/headers/tgammaf4.h
    newlib/libm/machine/spu/headers/truncd2.h
    newlib/libm/machine/spu/headers/truncf4.h
    src-release
Cherrypick from cygnus 1999-05-03 07:29:06 UTC Richard Henderson <rth@redhat.com> '19990502 sourceware import':
    config/mh-armpic
    config/mh-elfalphapic
    config/mh-m68kpic
    config/mh-papic
    config/mh-ppcpic
    config/mh-x86pic
Delete:
    config/extensions.m4
    config/futex.m4
    config/mh-pa
    config/mh-pa-hpux10
    config/mt-mips-gnu
    config/mt-mips16-compat
    config/override.m4
    config/proginstall.m4
    config/tcl.m4
    libgloss/bfin/basiccrt.S
    libgloss/bfin/bf522.ld
    libgloss/bfin/bf523.ld
    libgloss/bfin/bf524.ld
    libgloss/bfin/bf525.ld
    libgloss/bfin/bf526.ld
    libgloss/bfin/bf527.ld
    libgloss/bfin/bf531.ld
    libgloss/bfin/bf532.ld
    libgloss/bfin/bf533.ld
    libgloss/bfin/bf534.ld
    libgloss/bfin/bf536.ld
    libgloss/bfin/bf537.ld
    libgloss/bfin/bf538.ld
    libgloss/bfin/bf539.ld
    libgloss/bfin/bf542.ld
    libgloss/bfin/bf544.ld
    libgloss/bfin/bf547.ld
    libgloss/bfin/bf548.ld
    libgloss/bfin/bf549.ld
    libgloss/bfin/bf561.ld
    libgloss/bfin/bf561a.ld
    libgloss/bfin/bf561b.ld
    libgloss/bfin/bf561m.ld
    libgloss/bfin/bfin-common-mc.ld
    libgloss/bfin/bfin-common-sc.ld
    libgloss/bfin/include/blackfin.h
    libgloss/bfin/include/cdefBF522.h
    libgloss/bfin/include/cdefBF525.h
    libgloss/bfin/include/cdefBF527.h
    libgloss/bfin/include/cdefBF52x_base.h
    libgloss/bfin/include/cdefBF531.h
    libgloss/bfin/include/cdefBF532.h
    libgloss/bfin/include/cdefBF533.h
    libgloss/bfin/include/cdefBF534.h
    libgloss/bfin/include/cdefBF535.h
    libgloss/bfin/include/cdefBF536.h
    libgloss/bfin/include/cdefBF537.h
    libgloss/bfin/include/cdefBF538.h
    libgloss/bfin/include/cdefBF539.h
    libgloss/bfin/include/cdefBF53x.h
    libgloss/bfin/include/cdefBF541.h
    libgloss/bfin/include/cdefBF542.h
    libgloss/bfin/include/cdefBF544.h
    libgloss/bfin/include/cdefBF547.h
    libgloss/bfin/include/cdefBF548.h
    libgloss/bfin/include/cdefBF549.h
    libgloss/bfin/include/cdefBF54x_base.h
    libgloss/bfin/include/cdefBF561.h
    libgloss/bfin/include/cdef_LPBlackfin.h
    libgloss/bfin/include/cdefblackfin.h
    libgloss/bfin/include/cplb.h
    libgloss/bfin/include/cplbtab.h
    libgloss/bfin/include/defBF522.h
    libgloss/bfin/include/defBF525.h
    libgloss/bfin/include/defBF527.h
    libgloss/bfin/include/defBF52x_base.h
    libgloss/bfin/include/defBF531.h
    libgloss/bfin/include/defBF532.h
    libgloss/bfin/include/defBF533.h
    libgloss/bfin/include/defBF534.h
    libgloss/bfin/include/defBF535.h
    libgloss/bfin/include/defBF536.h
    libgloss/bfin/include/defBF537.h
    libgloss/bfin/include/defBF538.h
    libgloss/bfin/include/defBF539.h
    libgloss/bfin/include/defBF541.h
    libgloss/bfin/include/defBF542.h
    libgloss/bfin/include/defBF544.h
    libgloss/bfin/include/defBF547.h
    libgloss/bfin/include/defBF548.h
    libgloss/bfin/include/defBF549.h
    libgloss/bfin/include/defBF54x_base.h
    libgloss/bfin/include/defBF561.h
    libgloss/bfin/include/def_LPBlackfin.h
    libgloss/bfin/include/defblackfin.h
    libgloss/bfin/include/sys/_adi_platform.h
    libgloss/bfin/include/sys/anomaly_macros_rtl.h
    libgloss/bfin/include/sys/excause.h
    libgloss/bfin/include/sys/exception.h
    libgloss/bfin/include/sys/mc_typedef.h
    libgloss/bfin/include/sys/platform.h
    libgloss/bfin/include/sys/pll.h
    libgloss/bfin/include/sysreg.h
    libgloss/spu/linux_syscalls.c
    libgloss/xstormy16/isatty.c
    newlib/libc/machine/m68k/m68kasm.h
    newlib/libc/machine/spu/assert.c
    newlib/libc/machine/spu/impure.c
    newlib/libc/machine/spu/include/spu_timer.h
    newlib/libc/machine/spu/memcmp.c
    newlib/libc/machine/spu/spu_clock_stop.c
    newlib/libc/machine/spu/spu_clock_svcs.c
    newlib/libc/machine/spu/spu_timebase.c
    newlib/libc/machine/spu/spu_timer_flih.S
    newlib/libc/machine/spu/spu_timer_free.c
    newlib/libc/machine/spu/spu_timer_internal.h
    newlib/libc/machine/spu/spu_timer_slih.c
    newlib/libc/machine/spu/spu_timer_slih_reg.c
    newlib/libc/machine/spu/spu_timer_stop.c
    newlib/libc/machine/spu/spu_timer_svcs.c
    newlib/libc/machine/spu/straddr.h
    newlib/libc/machine/spu/strcpy.h
    newlib/libc/machine/spu/strncmp.h
    newlib/libc/machine/spu/sys/linux_syscalls.h
    newlib/libc/posix/_isatty.c
    newlib/libc/reent/isattyr.c
    newlib/libc/string/memmem.c
    newlib/libc/string/str-two-way.h
    newlib/libc/sys/linux/isatty.c
    newlib/libc/sys/linux/machine/i386/atomic.h
    newlib/libc/sys/linux/net/XXX-lookup.c
    newlib/libc/sys/linux/net/alias-lookup.c
    newlib/libc/sys/linux/net/aliases.h
    newlib/libc/sys/linux/net/check_pf.c
    newlib/libc/sys/linux/net/databases.def
    newlib/libc/sys/linux/net/digits_dots.c
    newlib/libc/sys/linux/net/ether_aton.c
    newlib/libc/sys/linux/net/ether_aton_r.c
    newlib/libc/sys/linux/net/ether_hton.c
    newlib/libc/sys/linux/net/ether_line.c
    newlib/libc/sys/linux/net/ether_ntoa.c
    newlib/libc/sys/linux/net/ether_ntoa_r.c
    newlib/libc/sys/linux/net/ether_ntoh.c
    newlib/libc/sys/linux/net/etherent.h
    newlib/libc/sys/linux/net/ethers-lookup.c
    newlib/libc/sys/linux/net/function.def
    newlib/libc/sys/linux/net/getXXbyYY.c
    newlib/libc/sys/linux/net/getXXbyYY_r.c
    newlib/libc/sys/linux/net/getXXent.c
    newlib/libc/sys/linux/net/getXXent_r.c
    newlib/libc/sys/linux/net/getaliasent.c
    newlib/libc/sys/linux/net/getaliasent_r.c
    newlib/libc/sys/linux/net/getaliasname.c
    newlib/libc/sys/linux/net/getaliasname_r.c
    newlib/libc/sys/linux/net/gethstbyad.c
    newlib/libc/sys/linux/net/gethstbyad_r.c
    newlib/libc/sys/linux/net/gethstbynm.c
    newlib/libc/sys/linux/net/gethstbynm2.c
    newlib/libc/sys/linux/net/gethstbynm2_r.c
    newlib/libc/sys/linux/net/gethstbynm_r.c
    newlib/libc/sys/linux/net/gethstent.c
    newlib/libc/sys/linux/net/gethstent_r.c
    newlib/libc/sys/linux/net/getnetbyad.c
    newlib/libc/sys/linux/net/getnetbyad_r.c
    newlib/libc/sys/linux/net/getnetbynm.c
    newlib/libc/sys/linux/net/getnetbynm_r.c
    newlib/libc/sys/linux/net/getnetent.c
    newlib/libc/sys/linux/net/getnetent_r.c
    newlib/libc/sys/linux/net/getnetgrent.c
    newlib/libc/sys/linux/net/getnetgrent_r.c
    newlib/libc/sys/linux/net/getnssent.c
    newlib/libc/sys/linux/net/getnssent_r.c
    newlib/libc/sys/linux/net/getproto_r.c
    newlib/libc/sys/linux/net/getprtent.c
    newlib/libc/sys/linux/net/getprtent_r.c
    newlib/libc/sys/linux/net/getprtname.c
    newlib/libc/sys/linux/net/getprtname_r.c
    newlib/libc/sys/linux/net/getrpcbyname.c
    newlib/libc/sys/linux/net/getrpcbyname_r.c
    newlib/libc/sys/linux/net/getrpcbynumber.c
    newlib/libc/sys/linux/net/getrpcbynumber_r.c
    newlib/libc/sys/linux/net/getrpcent.c
    newlib/libc/sys/linux/net/getrpcent_r.c
    newlib/libc/sys/linux/net/getservent_r.c
    newlib/libc/sys/linux/net/getsrvbynm.c
    newlib/libc/sys/linux/net/getsrvbynm_r.c
    newlib/libc/sys/linux/net/getsrvbypt.c
    newlib/libc/sys/linux/net/getsrvbypt_r.c
    newlib/libc/sys/linux/net/grp-lookup.c
    newlib/libc/sys/linux/net/herrno.c
    newlib/libc/sys/linux/net/hosts-lookup.c
    newlib/libc/sys/linux/net/ifaddrs.h
    newlib/libc/sys/linux/net/ifreq.c
    newlib/libc/sys/linux/net/ifreq.h
    newlib/libc/sys/linux/net/in6_addr.c
    newlib/libc/sys/linux/net/inet6_option.c
    newlib/libc/sys/linux/net/inet_mkadr.c
    newlib/libc/sys/linux/net/inet_net.c
    newlib/libc/sys/linux/net/key-lookup.c
    newlib/libc/sys/linux/net/local.h
    newlib/libc/sys/linux/net/netgroup.h
    newlib/libc/sys/linux/net/netgrp-lookup.c
    newlib/libc/sys/linux/net/network-lookup.c
    newlib/libc/sys/linux/net/not-cancel.h
    newlib/libc/sys/linux/net/ns_samedomain.c
    newlib/libc/sys/linux/net/nscd-types.h
    newlib/libc/sys/linux/net/nscd/nscd-client.h
    newlib/libc/sys/linux/net/nscd/nscd_proto.h
    newlib/libc/sys/linux/net/nss.h
    newlib/libc/sys/linux/net/nsswitch.c
    newlib/libc/sys/linux/net/nsswitch.h
    newlib/libc/sys/linux/net/opensock.c
    newlib/libc/sys/linux/net/proto-lookup.c
    newlib/libc/sys/linux/net/pwd-lookup.c
    newlib/libc/sys/linux/net/res_debug.h
    newlib/libc/sys/linux/net/res_hconf.c
    newlib/libc/sys/linux/net/res_hconf.h
    newlib/libc/sys/linux/net/res_libc.c
    newlib/libc/sys/linux/net/rexec.c
    newlib/libc/sys/linux/net/rpc-lookup.c
    newlib/libc/sys/linux/net/ruserpass.c
    newlib/libc/sys/linux/net/service-lookup.c
    newlib/libc/sys/linux/net/spwd-lookup.c
    newlib/libc/sys/linux/shlib-compat.h
    newlib/libc/syscalls/sysisatty.c
    newlib/testsuite/newlib.stdlib/size_max.c
    newlib/testsuite/newlib.stdlib/stdlib.exp

1 files changed, 542 insertions, 648 deletions

diff --git a/newlib/libc/sys/linux/net/rcmd.c b/newlib/libc/sys/linux/net/rcmd.c
index ab3ade89b..708b69d1b 100644
--- a/newlib/libc/sys/linux/net/rcmd.c
+++ b/newlib/libc/sys/linux/net/rcmd.c
@@ -1,32 +1,4 @@
 /*
- * Copyright (C) 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-/*
  * Copyright (c) 1983, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -38,6 +10,10 @@
  * 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.
@@ -58,51 +34,55 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+#include <sys/types.h>
+#include <time.h>
+#include <sys/select.h>
 
+#include "namespace.h"
 #include <sys/param.h>
-#include <sys/poll.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <alloca.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <netdb.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <pwd.h>
 #include <errno.h>
 #include <stdio.h>
-#include <stdio_ext.h>
 #include <ctype.h>
 #include <string.h>
-#include <libintl.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <sys/uio.h>
+#ifdef YP
+#include <rpc/rpc.h>
+#include <rpcsvc/yp_prot.h>
+#include <rpcsvc/ypclnt.h>
+#endif
+#include <arpa/nameser.h>
+#include "un-namespace.h"
 
-#include "local.h"
+/* wrapper for KAME-special getnameinfo() */
+#ifndef NI_WITHSCOPEID
+#define NI_WITHSCOPEID	0
+#endif
 
+extern int innetgr( const char *, const char *, const char *, const char * );
+extern int rcmdsh(char **ahost, int rport, const char *locuser, const char *remuser, const char *cmd, const char *rshprog);
+int rresvport_af(int *alport, int family);
 
-int __ivaliduser (FILE *, u_int32_t, const char *, const char *);
-static int __validuser2_sa (FILE *, struct sockaddr *, size_t,
-			    const char *, const char *, const char *);
-static int ruserok2_sa (struct sockaddr *ra, size_t ralen,
-			int superuser, const char *ruser,
-			const char *luser, const char *rhost);
-static int ruserok_sa (struct sockaddr *ra, size_t ralen,
-			int superuser, const char *ruser,
-			const char *luser);
-int iruserok_af (const void *raddr, int superuser, const char *ruser,
-		 const char *luser, sa_family_t af);
-int iruserok (u_int32_t raddr, int superuser, const char *ruser,
-	      const char *luser);
+#define max(a, b)	((a > b) ? a : b)
 
-libc_hidden_proto (iruserok_af)
+int __ivaliduser(FILE *, u_int32_t, const char *, const char *);
+int __ivaliduser_af(FILE *,const void *, const char *, const char *, int, int);
+int __ivaliduser_sa(FILE *, const struct sockaddr *, socklen_t, const char *,
+    const char *);
+static int __icheckhost(const struct sockaddr *, socklen_t, const char *);
 
-libc_freeres_ptr(static char *ahostbuf);
+char paddr[NI_MAXHOST];
 
 int
 rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af)
@@ -110,300 +90,242 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af)
 	u_short rport;
 	const char *locuser, *remuser, *cmd;
 	int *fd2p;
-	sa_family_t af;
+	int af;
 {
-	char paddr[INET6_ADDRSTRLEN];
 	struct addrinfo hints, *res, *ai;
 	struct sockaddr_storage from;
-	struct pollfd pfd[2];
-	int32_t oldmask;
+	fd_set reads;
+	sigset_t oldmask, newmask;
 	pid_t pid;
-	int s, lport, timo, error;
-	char c;
-	int refused;
+	int s, aport, lport, timo, error;
+	char c, *p;
+	int refused, nres;
 	char num[8];
-	ssize_t n;
+	static char canonnamebuf[MAXDNAME];	/* is it proper here? */
 
-	if (af != AF_INET && af != AF_INET6 && af != AF_UNSPEC)
-	  {
-	    __set_errno (EAFNOSUPPORT);
-	    return -1;
-	  }
+	/* call rcmdsh() with specified remote shell if appropriate. */
+	if (!issetugid() && (p = getenv("RSH"))) {
+		struct servent *sp = getservbyname("shell", "tcp");
 
-	pid = __getpid();
+		if (sp && sp->s_port == rport)
+			return (rcmdsh(ahost, rport, locuser, remuser,
+			    cmd, p));
+	}
+
+	/* use rsh(1) if non-root and remote port is shell. */
+	if (geteuid()) {
+		struct servent *sp = getservbyname("shell", "tcp");
+
+		if (sp && sp->s_port == rport)
+			return (rcmdsh(ahost, rport, locuser, remuser,
+			    cmd, NULL));
+	}
 
-	memset(&hints, '\0', sizeof(hints));
+	pid = getpid();
+
+	memset(&hints, 0, sizeof(hints));
 	hints.ai_flags = AI_CANONNAME;
 	hints.ai_family = af;
 	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_protocol = 0;
 	(void)snprintf(num, sizeof(num), "%d", ntohs(rport));
 	error = getaddrinfo(*ahost, num, &hints, &res);
 	if (error) {
-		if (error == EAI_NONAME && *ahost != NULL) {
-			if (_IO_fwide (stderr, 0) > 0)
-				__fwprintf(stderr, L"%s: Unknown host\n",
-					   *ahost);
-			else
-				fprintf(stderr, "%s: Unknown host\n", *ahost);
-		} else {
-			if (_IO_fwide (stderr, 0) > 0)
-				__fwprintf(stderr, L"rcmd: getaddrinfo: %s\n",
-					   gai_strerror(error));
-			else
-				fprintf(stderr, "rcmd: getaddrinfo: %s\n",
-					gai_strerror(error));
-		}
-                return (-1);
+		fprintf(stderr, "rcmd: getaddrinfo: %s\n",
+			gai_strerror(error));
+		if (error == EAI_SYSTEM)
+			fprintf(stderr, "rcmd: getaddrinfo: %s\n",
+				strerror(errno));
+		return (-1);
 	}
 
-	pfd[0].events = POLLIN;
-	pfd[1].events = POLLIN;
-
-	if (res->ai_canonname){
-		free (ahostbuf);
-		ahostbuf = strdup (res->ai_canonname);
-		if (ahostbuf == NULL) {
-			if (_IO_fwide (stderr, 0) > 0)
-				__fwprintf(stderr, L"%s",
-					   _("rcmd: Cannot allocate memory\n"));
-			else
-				fputs(_("rcmd: Cannot allocate memory\n"),
-				      stderr);
-			return (-1);
-		}
-		*ahost = ahostbuf;
-	} else
-		*ahost = NULL;
+	if (res->ai_canonname
+	 && strlen(res->ai_canonname) + 1 < sizeof(canonnamebuf)) {
+		strncpy(canonnamebuf, res->ai_canonname, sizeof(canonnamebuf));
+		*ahost = canonnamebuf;
+	}
+	nres = 0;
+	for (ai = res; ai; ai = ai->ai_next)
+		nres++;
 	ai = res;
 	refused = 0;
-	oldmask = __sigblock(sigmask(SIGURG));
+	sigemptyset(&newmask);
+	sigaddset(&newmask, SIGURG);
+	sigprocmask(SIG_BLOCK, (const sigset_t *)&newmask, &oldmask);
 	for (timo = 1, lport = IPPORT_RESERVED - 1;;) {
-		char errbuf[200];
-
 		s = rresvport_af(&lport, ai->ai_family);
 		if (s < 0) {
-			if (errno == EAGAIN) {
-				if (_IO_fwide (stderr, 0) > 0)
-					__fwprintf(stderr, L"%s",
-						   _("rcmd: socket: All ports in use\n"));
-				else
-					fputs(_("rcmd: socket: All ports in use\n"),
-					      stderr);
-			} else {
-				if (_IO_fwide (stderr, 0) > 0)
-					__fwprintf(stderr,
-						   L"rcmd: socket: %m\n");
-				else
-					fprintf(stderr, "rcmd: socket: %m\n");
+			if (errno != EAGAIN && ai->ai_next) {
+				ai = ai->ai_next;
+				continue;
 			}
-			__sigsetmask(oldmask);
+			if (errno == EAGAIN)
+				(void)fprintf(stderr,
+				    "rcmd: socket: All ports in use\n");
+			else
+				(void)fprintf(stderr, "rcmd: socket: %s\n",
+				    strerror(errno));
 			freeaddrinfo(res);
-			return -1;
+			sigprocmask(SIG_SETMASK, (const sigset_t *)&oldmask,
+			    NULL);
+			return (-1);
 		}
-		__fcntl(s, F_SETOWN, pid);
-		if (__connect(s, ai->ai_addr, ai->ai_addrlen) >= 0)
+		fcntl(s, F_SETOWN, pid);
+		if (connect(s, ai->ai_addr, ai->ai_addrlen) >= 0)
 			break;
-		(void)__close(s);
+		(void)close(s);
 		if (errno == EADDRINUSE) {
 			lport--;
 			continue;
 		}
 		if (errno == ECONNREFUSED)
 			refused = 1;
-		if (ai->ai_next != NULL) {
+		if (ai->ai_next == NULL && (!refused || timo > 16)) {
+			(void)fprintf(stderr, "%s: %s\n",
+				      *ahost, strerror(errno));
+			freeaddrinfo(res);
+			sigprocmask(SIG_SETMASK, (const sigset_t *)&oldmask,
+			    NULL);
+			return (-1);
+		}
+		if (nres > 1) {
 			int oerrno = errno;
-			char *buf = NULL;
 
 			getnameinfo(ai->ai_addr, ai->ai_addrlen,
 				    paddr, sizeof(paddr),
 				    NULL, 0,
-				    NI_NUMERICHOST);
-
-			if (__asprintf (&buf, _("connect to address %s: "),
-					paddr) >= 0)
-			  {
-			    if (_IO_fwide (stderr, 0) > 0)
-			      __fwprintf(stderr, L"%s", buf);
-			    else
-			      fputs (buf, stderr);
-			    free (buf);
-			  }
-			__set_errno (oerrno);
+				    NI_NUMERICHOST|NI_WITHSCOPEID);
+			(void)fprintf(stderr, "connect to address %s: ",
+				      paddr);
+			errno = oerrno;
 			perror(0);
-			ai = ai->ai_next;
-			getnameinfo(ai->ai_addr, ai->ai_addrlen,
-				    paddr, sizeof(paddr),
-				    NULL, 0,
-				    NI_NUMERICHOST);
-			if (__asprintf (&buf, _("Trying %s...\n"), paddr) >= 0)
-			  {
-			    if (_IO_fwide (stderr, 0) > 0)
-			      __fwprintf (stderr, L"%s", buf);
-			    else
-			      fputs (buf, stderr);
-			    free (buf);
-			  }
-			continue;
 		}
-		if (refused && timo <= 16) {
-			(void)sleep(timo);
+		if ((ai = ai->ai_next) == NULL) {
+			/* refused && timo <= 16 */
+			struct timespec time_to_sleep, time_remaining;
+
+			time_to_sleep.tv_sec = timo;
+			time_to_sleep.tv_nsec = 0;
+			(void)nanosleep(&time_to_sleep, &time_remaining);
 			timo *= 2;
 			ai = res;
 			refused = 0;
-			continue;
 		}
-		freeaddrinfo(res);
-		if (_IO_fwide (stderr, 0) > 0)
-			(void)__fwprintf(stderr, L"%s: %s\n", *ahost,
-					 strerror_r(errno,
-						      errbuf, sizeof (errbuf)));
-		else
-			(void)fprintf(stderr, "%s: %s\n", *ahost,
-				      strerror_r(errno,
-						   errbuf, sizeof (errbuf)));
-		__sigsetmask(oldmask);
-		return -1;
+		if (nres > 1) {
+			getnameinfo(ai->ai_addr, ai->ai_addrlen,
+				    paddr, sizeof(paddr),
+				    NULL, 0,
+				    NI_NUMERICHOST|NI_WITHSCOPEID);
+			fprintf(stderr, "Trying %s...\n", paddr);
+		}
 	}
 	lport--;
 	if (fd2p == 0) {
-		__write(s, "", 1);
+		write(s, "", 1);
 		lport = 0;
 	} else {
 		char num[8];
 		int s2 = rresvport_af(&lport, ai->ai_family), s3;
-		socklen_t len = ai->ai_addrlen;
+		int len = ai->ai_addrlen;
+		int nfds;
 
 		if (s2 < 0)
 			goto bad;
 		listen(s2, 1);
 		(void)snprintf(num, sizeof(num), "%d", lport);
-		if (__write(s, num, strlen(num)+1) != (ssize_t)strlen(num)+1) {
-			char *buf = NULL;
-
-			if (__asprintf (&buf, _("\
-rcmd: write (setting up stderr): %m\n")) >= 0)
-			  {
-			    if (_IO_fwide (stderr, 0) > 0)
-			      __fwprintf(stderr, L"%s", buf);
-			    else
-			      fputs (buf, stderr);
-			    free (buf);
-			  }
-			(void)__close(s2);
+		if (write(s, num, strlen(num)+1) != strlen(num)+1) {
+			(void)fprintf(stderr,
+			    "rcmd: write (setting up stderr): %s\n",
+			    strerror(errno));
+			(void)close(s2);
 			goto bad;
 		}
-		pfd[0].fd = s;
-		pfd[1].fd = s2;
-		__set_errno (0);
-		if (__poll (pfd, 2, -1) < 1 || (pfd[1].revents & POLLIN) == 0){
-			char *buf = NULL;
-
-			if ((errno != 0
-			     && __asprintf(&buf, _("\
-rcmd: poll (setting up stderr): %m\n")) >= 0)
-			    || (errno == 0
-				&& __asprintf(&buf, _("\
-poll: protocol failure in circuit setup\n")) >= 0))
-			  {
-			    if (_IO_fwide (stderr, 0) > 0)
-			      __fwprintf (stderr, L"%s", buf);
-			    else
-			      fputs (buf, stderr);
-			    free  (buf);
-			  }
-			(void)__close(s2);
+		nfds = max(s, s2)+1;
+		if(nfds > FD_SETSIZE) {
+			fprintf(stderr, "rcmd: too many files\n");
+			(void)close(s2);
 			goto bad;
 		}
-		s3 = TEMP_FAILURE_RETRY (accept(s2, (struct sockaddr *)&from,
-						&len));
+again:
+		FD_ZERO(&reads);
+		FD_SET(s, &reads);
+		FD_SET(s2, &reads);
+		errno = 0;
+		if (select(nfds, &reads, 0, 0, 0) < 1 || !FD_ISSET(s2, &reads)){
+			if (errno != 0)
+				(void)fprintf(stderr,
+				    "rcmd: select (setting up stderr): %s\n",
+				    strerror(errno));
+			else
+				(void)fprintf(stderr,
+				"select: protocol failure in circuit setup\n");
+			(void)close(s2);
+			goto bad;
+		}
+		s3 = accept(s2, (struct sockaddr *)&from, &len);
 		switch (from.ss_family) {
 		case AF_INET:
-			rport = ntohs(((struct sockaddr_in *)&from)->sin_port);
+			aport = ntohs(((struct sockaddr_in *)&from)->sin_port);
 			break;
+#ifdef INET6
 		case AF_INET6:
-			rport = ntohs(((struct sockaddr_in6 *)&from)->sin6_port);
+			aport = ntohs(((struct sockaddr_in6 *)&from)->sin6_port);
 			break;
+#endif
 		default:
-			rport = 0;
+			aport = 0;	/* error */
 			break;
 		}
-		(void)__close(s2);
+		/*
+		 * XXX careful for ftp bounce attacks. If discovered, shut them
+		 * down and check for the real auxiliary channel to connect.
+		 */
+		if (aport == 20) {
+			close(s3);
+			goto again;
+		}
+		(void)close(s2);
 		if (s3 < 0) {
-			if (_IO_fwide (stderr, 0) > 0)
-				(void)__fwprintf(stderr,
-						 L"rcmd: accept: %m\n");
-			else
-				(void)fprintf(stderr,
-					      "rcmd: accept: %m\n");
+			(void)fprintf(stderr,
+			    "rcmd: accept: %s\n", strerror(errno));
 			lport = 0;
 			goto bad;
 		}
 		*fd2p = s3;
-
-		if (rport >= IPPORT_RESERVED || rport < IPPORT_RESERVED / 2){
-			char *buf = NULL;
-
-			if (__asprintf(&buf, _("\
-socket: protocol failure in circuit setup\n")) >= 0)
-			  {
-			    if (_IO_fwide (stderr, 0) > 0)
-			      __fwprintf (stderr, L"%s", buf);
-			    else
-			      fputs (buf, stderr);
-			    free (buf);
-			  }
+		if (aport >= IPPORT_RESERVED || aport < IPPORT_RESERVED / 2) {
+			(void)fprintf(stderr,
+			    "socket: protocol failure in circuit setup.\n");
 			goto bad2;
 		}
 	}
-	struct iovec iov[3] =
-	  {
-	    [0] = { .iov_base = (void *) locuser,
-		    .iov_len = strlen (locuser) + 1 },
-	    [1] = { .iov_base = (void *) remuser,
-		    .iov_len = strlen (remuser) + 1 },
-	    [2] = { .iov_base = (void *) cmd,
-		    .iov_len = strlen (cmd) + 1 }
-	  };
-	(void) TEMP_FAILURE_RETRY (writev (s, iov, 3));
-	n = TEMP_FAILURE_RETRY (read(s, &c, 1));
-	if (n != 1) {
-		char *buf = NULL;
-
-		if ((n == 0
-		     && asprintf(&buf, _("rcmd: %s: short read"),
-				   *ahost) >= 0)
-		    || (n != 0
-			&& asprintf(&buf, "rcmd: %s: %m\n", *ahost) >= 0))
-		  {
-		    if (_IO_fwide (stderr, 0) > 0)
-		      __fwprintf (stderr, L"%s", buf);
-		    else
-		      fputs (buf, stderr);
-		    free (buf);
-		  }
+	(void)write(s, locuser, strlen(locuser)+1);
+	(void)write(s, remuser, strlen(remuser)+1);
+	(void)write(s, cmd, strlen(cmd)+1);
+	if (read(s, &c, 1) != 1) {
+		(void)fprintf(stderr,
+		    "rcmd: %s: %s\n", *ahost, strerror(errno));
 		goto bad2;
 	}
 	if (c != 0) {
-		while (__read(s, &c, 1) == 1) {
-			(void)__write(STDERR_FILENO, &c, 1);
+		while (read(s, &c, 1) == 1) {
+			(void)write(STDERR_FILENO, &c, 1);
 			if (c == '\n')
 				break;
 		}
 		goto bad2;
 	}
-	__sigsetmask(oldmask);
+	sigprocmask(SIG_SETMASK, (const sigset_t *)&oldmask, NULL);
 	freeaddrinfo(res);
-	return s;
+	return (s);
 bad2:
 	if (lport)
-		(void)__close(*fd2p);
+		(void)close(*fd2p);
 bad:
-	(void)__close(s);
-	__sigsetmask(oldmask);
+	(void)close(s);
+	sigprocmask(SIG_SETMASK, (const sigset_t *)&oldmask, NULL);
 	freeaddrinfo(res);
-	return -1;
+	return (-1);
 }
-libc_hidden_def (rcmd_af)
 
 int
 rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
@@ -412,155 +334,90 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
 	const char *locuser, *remuser, *cmd;
 	int *fd2p;
 {
-  return rcmd_af (ahost, rport, locuser, remuser, cmd, fd2p, AF_INET);
+	return rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, AF_INET);
+}
+
+int
+rresvport(port)
+	int *port;
+{
+	return rresvport_af(port, AF_INET);
 }
 
 int
 rresvport_af(alport, family)
-	int *alport;
-	sa_family_t family;
+	int *alport, family;
 {
-	struct sockaddr_storage ss;
 	int s;
-	size_t len;
-	uint16_t *sport;
+	struct sockaddr_storage ss;
+	u_short *sport;
 
-	switch(family){
+	memset(&ss, 0, sizeof(ss));
+	ss.ss_family = family;
+	switch (family) {
 	case AF_INET:
-		len = sizeof(struct sockaddr_in);
 		sport = &((struct sockaddr_in *)&ss)->sin_port;
+		((struct sockaddr_in *)&ss)->sin_addr.s_addr = INADDR_ANY;
 		break;
+#ifdef INET6
 	case AF_INET6:
-		len = sizeof(struct sockaddr_in6);
 		sport = &((struct sockaddr_in6 *)&ss)->sin6_port;
+		((struct sockaddr_in6 *)&ss)->sin6_addr = in6addr_any;
 		break;
+#endif
 	default:
-		__set_errno (EAFNOSUPPORT);
+		errno = EAFNOSUPPORT;
 		return -1;
 	}
-	s = __socket(family, SOCK_STREAM, 0);
-	if (s < 0)
-		return -1;
 
-	memset (&ss, '\0', sizeof(ss));
-#ifdef SALEN
-	ss.__ss_len = len;
+	s = socket(ss.ss_family, SOCK_STREAM, 0);
+	if (s < 0)
+		return (-1);
+#if 0 /* compat_exact_traditional_rresvport_semantics */
+	sin.sin_port = htons((u_short)*alport);
+	if (_bind(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
+		return (s);
+	if (errno != EADDRINUSE) {
+		(void)close(s);
+		return (-1);
+	}
 #endif
-	ss.ss_family = family;
-
-	/* Ignore invalid values.  */
-	if (*alport < IPPORT_RESERVED / 2)
-		*alport = IPPORT_RESERVED / 2;
-	else if (*alport >= IPPORT_RESERVED)
-		*alport = IPPORT_RESERVED - 1;
-
-	int start = *alport;
-	do {
-		*sport = htons((uint16_t) *alport);
-		if (__bind(s, (struct sockaddr *)&ss, len) >= 0)
-			return s;
-		if (errno != EADDRINUSE) {
-			(void)__close(s);
-			return -1;
-		}
-		if ((*alport)-- == IPPORT_RESERVED/2)
-			*alport = IPPORT_RESERVED - 1;
-	} while (*alport != start);
-	(void)__close(s);
-	__set_errno (EAGAIN);
-	return -1;
-}
-libc_hidden_def (rresvport_af)
-
-int
-rresvport(alport)
-	int *alport;
-{
-	return rresvport_af(alport, AF_INET);
+	*sport = 0;
+	if (bindresvport_sa(s, (struct sockaddr *)&ss) == -1) {
+		(void)close(s);
+		return (-1);
+	}
+	*alport = (int)ntohs(*sport);
+	return (s);
 }
 
 int	__check_rhosts_file = 1;
 char	*__rcmd_errstr;
 
 int
-ruserok_af(rhost, superuser, ruser, luser, af)
-	const char *rhost, *ruser, *luser;
-	int superuser;
-	sa_family_t af;
-{
-	struct addrinfo hints, *res, *res0;
-	int gai;
-	int ret;
-
-	memset (&hints, '\0', sizeof(hints));
-	hints.ai_family = af;
-	gai = getaddrinfo(rhost, NULL, &hints, &res0);
-	if (gai)
-		return -1;
-	ret = -1;
-	for (res=res0; res; res=res->ai_next)
-		if (ruserok2_sa(res->ai_addr, res->ai_addrlen,
-				superuser, ruser, luser, rhost) == 0){
-			ret = 0;
-			break;
-		}
-	freeaddrinfo(res0);
-	return (ret);
-}
-libc_hidden_def (ruserok_af)
-
-int
 ruserok(rhost, superuser, ruser, luser)
 	const char *rhost, *ruser, *luser;
 	int superuser;
 {
-	return ruserok_af(rhost, superuser, ruser, luser, AF_INET);
-}
-
-/* Extremely paranoid file open function. */
-static FILE *
-iruserfopen (const char *file, uid_t okuser)
-{
-  struct stat64 st;
-  char *cp = NULL;
-  FILE *res = NULL;
-
-  /* If not a regular file, if owned by someone other than user or
-     root, if writeable by anyone but the owner, or if hardlinked
-     anywhere, quit.  */
-  cp = NULL;
-  if (__lxstat64 (_STAT_VER, file, &st))
-    cp = _("lstat failed");
-  else if (!S_ISREG (st.st_mode))
-    cp = _("not regular file");
-  else
-    {
-      res = fopen (file, "rc");
-      if (!res)
-	cp = _("cannot open");
-      else if (__fxstat64 (_STAT_VER, fileno (res), &st) < 0)
-	cp = _("fstat failed");
-      else if (st.st_uid && st.st_uid != okuser)
-	cp = _("bad owner");
-      else if (st.st_mode & (S_IWGRP|S_IWOTH))
-	cp = _("writeable by other than owner");
-      else if (st.st_nlink > 1)
-	cp = _("hard linked somewhere");
-    }
-
-  /* If there were any problems, quit.  */
-  if (cp != NULL)
-    {
-      __rcmd_errstr = cp;
-      if (res)
-	fclose (res);
-      return NULL;
-    }
-
-  /* No threads use this stream.  */
-  __fsetlocking (res, FSETLOCKING_BYCALLER);
-
-  return res;
+	struct addrinfo hints, *res, *r;
+	int error;
+
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = PF_UNSPEC;
+	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
+	error = getaddrinfo(rhost, "0", &hints, &res);
+	if (error)
+		return (-1);
+
+	for (r = res; r; r = r->ai_next) {
+		if (iruserok_sa(r->ai_addr, r->ai_addrlen, superuser, ruser,
+		    luser) == 0) {
+			freeaddrinfo(res);
+			return (0);
+		}
+	}
+	freeaddrinfo(res);
+	return (-1);
 }
 
 /*
@@ -572,127 +429,110 @@ iruserfopen (const char *file, uid_t okuser)
  *
  * Returns 0 if ok, -1 if not ok.
  */
-static int
-ruserok2_sa (ra, ralen, superuser, ruser, luser, rhost)
-     struct sockaddr *ra;
-     size_t ralen;
-     int superuser;
-     const char *ruser, *luser, *rhost;
+int
+iruserok(raddr, superuser, ruser, luser)
+	unsigned long raddr;
+	int superuser;
+	const char *ruser, *luser;
 {
-  FILE *hostf = NULL;
-  int isbad = -1;
-
-  if (!superuser)
-    hostf = iruserfopen (_PATH_HEQUIV, 0);
-
-  if (hostf)
-    {
-      isbad = __validuser2_sa (hostf, ra, ralen, luser, ruser, rhost);
-      fclose (hostf);
-
-      if (!isbad)
-	return 0;
-    }
-
-  if (__check_rhosts_file || superuser)
-    {
-      char *pbuf;
-      struct passwd pwdbuf, *pwd;
-      size_t dirlen;
-      size_t buflen = __sysconf (_SC_GETPW_R_SIZE_MAX);
-      char *buffer = __alloca (buflen);
-      uid_t uid;
-
-      if (__getpwnam_r (luser, &pwdbuf, buffer, buflen, &pwd) != 0
-	  || pwd == NULL)
-	return -1;
-
-      dirlen = strlen (pwd->pw_dir);
-      pbuf = alloca (dirlen + sizeof "/.rhosts");
-      __mempcpy (__mempcpy (pbuf, pwd->pw_dir, dirlen),
-		 "/.rhosts", sizeof "/.rhosts");
-
-       /* Change effective uid while reading .rhosts.  If root and
-	  reading an NFS mounted file system, can't read files that
-	  are protected read/write owner only.  */
-       uid = __geteuid ();
-       seteuid (pwd->pw_uid);
-       hostf = iruserfopen (pbuf, pwd->pw_uid);
-
-       if (hostf != NULL)
-	 {
-           isbad = __validuser2_sa (hostf, ra, ralen, luser, ruser, rhost);
-           fclose (hostf);
-	 }
-
-       seteuid (uid);
-       return isbad;
-    }
-  return -1;
+	struct sockaddr_in sin;
+	int sin_len;
+
+	memset(&sin, 0, sizeof(sin));
+	sin.sin_family = AF_INET;
+	sin_len = sizeof(struct sockaddr_in);
+	memcpy(&sin.sin_addr, &raddr, sizeof(sin.sin_addr));
+	return iruserok_sa((struct sockaddr *)&sin, sin_len, superuser,
+		ruser, luser);
 }
+
 /*
- * ruserok_sa() is now discussed on ipng, so
- * currently disabled for external use
+ * AF independent extension of iruserok.
+ *
+ * Returns 0 if ok, -1 if not ok.
  */
-static int ruserok_sa(ra, ralen, superuser, ruser, luser)
-     struct sockaddr *ra;
-     size_t ralen;
-     int superuser;
-     const char *ruser, *luser;
-{
-  return ruserok2_sa(ra, ralen, superuser, ruser, luser, "-");
-}
-
-/* This is the exported version.  */
 int
-iruserok_af (raddr, superuser, ruser, luser, af)
-     const void *raddr;
-     int superuser;
-     const char *ruser, *luser;
-     sa_family_t af;
+iruserok_sa(ra, rlen, superuser, ruser, luser)
+	const void *ra;
+	int rlen;
+	int superuser;
+	const char *ruser, *luser;
 {
-  struct sockaddr_storage ra;
-  size_t ralen;
-
-  memset (&ra, '\0', sizeof(ra));
-  switch (af){
-  case AF_INET:
-    ((struct sockaddr_in *)&ra)->sin_family = AF_INET;
-    memcpy (&(((struct sockaddr_in *)&ra)->sin_addr), raddr,
-	    sizeof(struct in_addr));
-    ralen = sizeof(struct sockaddr_in);
-    break;
-  case AF_INET6:
-    ((struct sockaddr_in6 *)&ra)->sin6_family = AF_INET6;
-    memcpy (&(((struct sockaddr_in6 *)&ra)->sin6_addr), raddr,
-            sizeof(struct in6_addr));
-    ralen = sizeof(struct sockaddr_in6);
-    break;
-  default:
-    return 0;
-  }
-  return ruserok_sa ((struct sockaddr *)&ra, ralen, superuser, ruser, luser);
-}
-libc_hidden_def (iruserok_af)
+	char *cp;
+	struct stat sbuf;
+	struct passwd *pwd;
+	FILE *hostf;
+	uid_t uid;
+	int first;
+	char pbuf[MAXPATHLEN];
+	const struct sockaddr *raddr;
+	struct sockaddr_storage ss;
 
-int
-iruserok (raddr, superuser, ruser, luser)
-     u_int32_t raddr;
-     int superuser;
-     const char *ruser, *luser;
-{
-  return iruserok_af (&raddr, superuser, ruser, luser, AF_INET);
+	/* avoid alignment issue */
+	if (rlen > sizeof(ss)) 
+		return(-1);
+	memcpy(&ss, ra, rlen);
+	raddr = (struct sockaddr *)&ss;
+
+	first = 1;
+	hostf = superuser ? NULL : fopen(_PATH_HEQUIV, "r");
+again:
+	if (hostf) {
+		if (__ivaliduser_sa(hostf, raddr, rlen, luser, ruser) == 0) {
+			(void)fclose(hostf);
+			return (0);
+		}
+		(void)fclose(hostf);
+	}
+	if (first == 1 && (__check_rhosts_file || superuser)) {
+		first = 0;
+		if ((pwd = getpwnam(luser)) == NULL)
+			return (-1);
+		(void)strcpy(pbuf, pwd->pw_dir);
+		(void)strcat(pbuf, "/.rhosts");
+
+		/*
+		 * Change effective uid while opening .rhosts.  If root and
+		 * reading an NFS mounted file system, can't read files that
+		 * are protected read/write owner only.
+		 */
+		uid = geteuid();
+		(void)seteuid(pwd->pw_uid);
+		hostf = fopen(pbuf, "r");
+		(void)seteuid(uid);
+
+		if (hostf == NULL)
+			return (-1);
+		/*
+		 * If not a regular file, or is owned by someone other than
+		 * user or root or if writeable by anyone but the owner, quit.
+		 */
+		cp = NULL;
+		if (lstat(pbuf, &sbuf) < 0)
+			cp = ".rhosts lstat failed";
+		else if (!S_ISREG(sbuf.st_mode))
+			cp = ".rhosts not regular file";
+		else if (fstat(fileno(hostf), &sbuf) < 0)
+			cp = ".rhosts fstat failed";
+		else if (sbuf.st_uid && sbuf.st_uid != pwd->pw_uid)
+			cp = "bad .rhosts owner";
+		else if (sbuf.st_mode & (S_IWGRP|S_IWOTH))
+			cp = ".rhosts writeable by other than owner";
+		/* If there were any problems, quit. */
+		if (cp) {
+			__rcmd_errstr = cp;
+			(void)fclose(hostf);
+			return (-1);
+		}
+		goto again;
+	}
+	return (-1);
 }
 
 /*
  * XXX
  * Don't make static, used by lpd(8).
  *
- * This function is not used anymore. It is only present because lpd(8)
- * calls it (!?!). We simply call __invaliduser2() with an illegal rhost
- * argument. This means that netgroups won't work in .rhost/hosts.equiv
- * files. If you want lpd to work with netgroups, fix lpd to use ruserok()
- * or PAM.
  * Returns 0 if ok, -1 if not ok.
  */
 int
@@ -701,185 +541,239 @@ __ivaliduser(hostf, raddr, luser, ruser)
 	u_int32_t raddr;
 	const char *luser, *ruser;
 {
-	struct sockaddr_in ra;
-	memset(&ra, '\0', sizeof(ra));
-	ra.sin_family = AF_INET;
-	ra.sin_addr.s_addr = raddr;
-	return __validuser2_sa(hostf, (struct sockaddr *)&ra, sizeof(ra),
-			       luser, ruser, "-");
+	struct sockaddr_in sin;
+	int sin_len;
+
+	memset(&sin, 0, sizeof(sin));
+	sin.sin_family = AF_INET;
+	sin_len = sizeof(struct sockaddr_in);
+	memcpy(&sin.sin_addr, &raddr, sizeof(sin.sin_addr));
+	return __ivaliduser_sa(hostf, (struct sockaddr *)&sin, sin_len,
+		luser, ruser);
 }
 
-
-/* Returns 1 on positive match, 0 on no match, -1 on negative match.  */
-static int
-internal_function
-__checkhost_sa (struct sockaddr *ra, size_t ralen, char *lhost,
-		const char *rhost)
+/*
+ * Returns 0 if ok, -1 if not ok.
+ *
+ * XXX obsolete API.
+ */
+int
+__ivaliduser_af(hostf, raddr, luser, ruser, af, len)
+	FILE *hostf;
+	const void *raddr;
+	const char *luser, *ruser;
+	int af, len;
 {
-	struct addrinfo hints, *res0, *res;
-	char raddr[INET6_ADDRSTRLEN];
-	int match;
-	int negate=1;    /* Multiply return with this to get -1 instead of 1 */
-
-	/* Check nis netgroup.  */
-	if (strncmp ("+@", lhost, 2) == 0)
-		return innetgr (&lhost[2], rhost, NULL, NULL);
-
-	if (strncmp ("-@", lhost, 2) == 0)
-		return -innetgr (&lhost[2], rhost, NULL, NULL);
-
-	/* -host */
-	if (strncmp ("-", lhost,1) == 0) {
-		negate = -1;
-		lhost++;
-	} else if (strcmp ("+",lhost) == 0) {
-		return 1;                    /* asking for trouble, but ok.. */
-	}
+	struct sockaddr *sa = NULL;
+	struct sockaddr_in *sin = NULL;
+#ifdef INET6
+	struct sockaddr_in6 *sin6 = NULL;
+#endif
+	struct sockaddr_storage ss;
 
-	/* Try for raw ip address first. */
-	/* XXX */
-	if (getnameinfo(ra, ralen,
-			raddr, sizeof(raddr), NULL, 0,
-			NI_NUMERICHOST) == 0
-	    && strcmp(raddr, lhost) == 0)
-		return negate;
-
-	/* Better be a hostname. */
-	match = 0;
-	memset(&hints, '\0', sizeof(hints));
-	hints.ai_family = ra->sa_family;
-	if (getaddrinfo(lhost, NULL, &hints, &res0) == 0){
-		/* Spin through ip addresses. */
-		for (res = res0; res; res = res->ai_next)
-		  {
-		    if (res->ai_family == ra->sa_family
-			&& !memcmp(res->ai_addr, ra, res->ai_addrlen))
-		      {
-			match = 1;
-			break;
-		      }
-		  }
-		freeaddrinfo (res0);
+	memset(&ss, 0, sizeof(ss));
+	switch (af) {
+	case AF_INET:
+		if (len != sizeof(sin->sin_addr))
+			return -1;
+		sin = (struct sockaddr_in *)&ss;
+		sin->sin_family = AF_INET;
+		memcpy(&sin->sin_addr, raddr, sizeof(sin->sin_addr));
+		break;
+#ifdef INET6
+	case AF_INET6:
+		if (len != sizeof(sin6->sin6_addr))
+			return -1;
+		/* you will lose scope info */
+		sin6 = (struct sockaddr_in6 *)&ss;
+		sin6->sin6_family = AF_INET6;
+		memcpy(&sin6->sin6_addr, raddr, sizeof(sin6->sin6_addr));
+		break;
+#endif
+	default:
+		return -1;
 	}
-	return negate * match;
-}
-
-/* Returns 1 on positive match, 0 on no match, -1 on negative match.  */
-static int
-internal_function
-__icheckuser (const char *luser, const char *ruser)
-{
-    /*
-      luser is user entry from .rhosts/hosts.equiv file
-      ruser is user id on remote host
-      */
-
-    /* [-+]@netgroup */
-    if (strncmp ("+@", luser, 2) == 0)
-	return innetgr (&luser[2], NULL, ruser, NULL);
-
-    if (strncmp ("-@", luser,2) == 0)
-	return -innetgr (&luser[2], NULL, ruser, NULL);
 
-    /* -user */
-    if (strncmp ("-", luser, 1) == 0)
-	return -(strcmp (&luser[1], ruser) == 0);
-
-    /* + */
-    if (strcmp ("+", luser) == 0)
-	return 1;
-
-    /* simple string match */
-    return strcmp (ruser, luser) == 0;
+	sa = (struct sockaddr *)&ss;
+	return __ivaliduser_sa(hostf, sa, 0, luser, ruser);
 }
 
-/*
- * Returns 1 for blank lines (or only comment lines) and 0 otherwise
- */
-static int
-__isempty (char *p)
+int
+__ivaliduser_sa(hostf, raddr, salen, luser, ruser)
+	FILE *hostf;
+	const struct sockaddr *raddr;
+	socklen_t salen;
+	const char *luser, *ruser;
 {
-    while (*p && isspace (*p)) {
-	++p;
-    }
-
-    return (*p == '\0' || *p == '#') ? 1 : 0 ;
+	char *user, *p;
+	int ch;
+	char buf[MAXHOSTNAMELEN + 128];		/* host + login */
+	char hname[MAXHOSTNAMELEN];
+	/* Presumed guilty until proven innocent. */
+	int userok = 0, hostok = 0;
+#ifdef YP
+	char *ypdomain;
+
+	if (yp_get_default_domain(&ypdomain))
+		ypdomain = NULL;
+#else
+#define	ypdomain NULL
+#endif
+	/* We need to get the damn hostname back for netgroup matching. */
+	if (getnameinfo(raddr, salen, hname, sizeof(hname), NULL, 0,
+			NI_NAMEREQD) != 0)
+		return (-1);
+
+	while (fgets(buf, sizeof(buf), hostf)) {
+		p = buf;
+		/* Skip lines that are too long. */
+		if (strchr(p, '\n') == NULL) {
+			while ((ch = getc(hostf)) != '\n' && ch != EOF);
+			continue;
+		}
+		if (*p == '\n' || *p == '#') {
+			/* comment... */
+			continue;
+		}
+		while (*p != '\n' && *p != ' ' && *p != '\t' && *p != '\0') {
+			*p = isupper((unsigned char)*p) ? tolower((unsigned char)*p) : *p;
+			p++;
+		}
+		if (*p == ' ' || *p == '\t') {
+			*p++ = '\0';
+			while (*p == ' ' || *p == '\t')
+				p++;
+			user = p;
+			while (*p != '\n' && *p != ' ' &&
+			    *p != '\t' && *p != '\0')
+				p++;
+		} else
+			user = p;
+		*p = '\0';
+		/*
+		 * Do +/- and +@/-@ checking. This looks really nasty,
+		 * but it matches SunOS's behavior so far as I can tell.
+		 */
+		switch(buf[0]) {
+		case '+':
+			if (!buf[1]) {     /* '+' matches all hosts */
+				hostok = 1;
+				break;
+			}
+			if (buf[1] == '@')  /* match a host by netgroup */
+				hostok = innetgr((char *)&buf[2],
+					(char *)&hname, NULL, ypdomain);
+			else		/* match a host by addr */
+				hostok = __icheckhost(raddr, salen,
+						      (char *)&buf[1]);
+			break;
+		case '-':     /* reject '-' hosts and all their users */
+			if (buf[1] == '@') {
+				if (innetgr((char *)&buf[2],
+					      (char *)&hname, NULL, ypdomain))
+					return(-1);
+			} else {
+				if (__icheckhost(raddr, salen,
+						 (char *)&buf[1]))
+					return(-1);
+			}
+			break;
+		default:  /* if no '+' or '-', do a simple match */
+			hostok = __icheckhost(raddr, salen, buf);
+			break;
+		}
+		switch(*user) {
+		case '+':
+			if (!*(user+1)) {      /* '+' matches all users */
+				userok = 1;
+				break;
+			}
+			if (*(user+1) == '@')  /* match a user by netgroup */
+				userok = innetgr(user+2, NULL, ruser, ypdomain);
+			else	   /* match a user by direct specification */
+				userok = !(strcmp(ruser, user+1));
+			break;
+		case '-': 		/* if we matched a hostname, */
+			if (hostok) {   /* check for user field rejections */
+				if (!*(user+1))
+					return(-1);
+				if (*(user+1) == '@') {
+					if (innetgr(user+2, NULL,
+							ruser, ypdomain))
+						return(-1);
+				} else {
+					if (!strcmp(ruser, user+1))
+						return(-1);
+				}
+			}
+			break;
+		default:	/* no rejections: try to match the user */
+			if (hostok)
+				userok = !(strcmp(ruser,*user ? user : luser));
+			break;
+		}
+		if (hostok && userok)
+			return(0);
+	}
+	return (-1);
 }
 
 /*
- * Returns 0 if positive match, -1 if _not_ ok.
+ * Returns "true" if match, 0 if no match.
+ *
+ * NI_WITHSCOPEID is useful for comparing sin6_scope_id portion
+ * if af == AF_INET6.
  */
 static int
-__validuser2_sa(hostf, ra, ralen, luser, ruser, rhost)
-	FILE *hostf;
-	struct sockaddr *ra;
-	size_t ralen;
-	const char *luser, *ruser, *rhost;
+__icheckhost(raddr, salen, lhost)
+	const struct sockaddr *raddr;
+	socklen_t salen;
+        const char *lhost;
 {
-    register const char *user;
-    register char *p;
-    int hcheck, ucheck;
-    char *buf = NULL;
-    size_t bufsize = 0;
-    int retval = -1;
-
-    while (__getline (&buf, &bufsize, hostf) > 0) {
-	buf[bufsize - 1] = '\0'; /* Make sure it's terminated.  */
-        p = buf;
-
-	/* Skip empty or comment lines */
-	if (__isempty (p)) {
-	    continue;
-	}
-
-	for (;*p && !isspace(*p); ++p) {
-	    *p = _tolower (*p);
+	struct sockaddr_in sin;
+	struct sockaddr_in6 *sin6;
+	struct addrinfo hints, *res, *r;
+	int error;
+	char h1[NI_MAXHOST], h2[NI_MAXHOST];
+
+	if (raddr->sa_family == AF_INET6) {
+		sin6 = (struct sockaddr_in6 *)raddr;
+		if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
+			memset(&sin, 0, sizeof(sin));
+			sin.sin_family = AF_INET;
+			memcpy(&sin.sin_addr, &sin6->sin6_addr.s6_addr[12],
+			       sizeof(sin.sin_addr));
+			raddr = (struct sockaddr *)&sin;
+			salen = sizeof(struct sockaddr_in);
+		}
 	}
 
-	/* Next we want to find the permitted name for the remote user.  */
-	if (*p == ' ' || *p == '\t') {
-	    /* <nul> terminate hostname and skip spaces */
-	    for (*p++='\0'; *p && isspace (*p); ++p);
-
-	    user = p;                   /* this is the user's name */
-	    while (*p && !isspace (*p))
-		++p;                    /* find end of user's name */
-	} else
-	    user = p;
-
-	*p = '\0';              /* <nul> terminate username (+host?) */
-
-	/* buf -> host(?) ; user -> username(?) */
-
-	/* First check host part */
-	hcheck = __checkhost_sa (ra, ralen, buf, rhost);
-
-	if (hcheck < 0)
-	    break;
-
-	if (hcheck) {
-	    /* Then check user part */
-	    if (! (*user))
-		user = luser;
-
-	    ucheck = __icheckuser (user, ruser);
-
-	    /* Positive 'host user' match? */
-	    if (ucheck > 0) {
-		retval = 0;
-		break;
-	    }
-
-	    /* Negative 'host -user' match? */
-	    if (ucheck < 0)
-		break;
-
-	    /* Neither, go on looking for match */
+	h1[0] = '\0';
+	if (getnameinfo(raddr, salen, h1, sizeof(h1), NULL, 0,
+			NI_NUMERICHOST | NI_WITHSCOPEID) != 0)
+		return (0);
+
+	/* Resolve laddr into sockaddr */
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = raddr->sa_family;
+	hints.ai_socktype = SOCK_DGRAM;	/*XXX dummy*/
+	res = NULL;
+	error = getaddrinfo(lhost, "0", &hints, &res);
+	if (error)
+		return (0);
+
+	for (r = res; r ; r = r->ai_next) {
+		h2[0] = '\0';
+		if (getnameinfo(r->ai_addr, r->ai_addrlen, h2, sizeof(h2),
+				NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID) != 0)
+			continue;
+		if (strcmp(h1, h2) == 0) {
+			freeaddrinfo(res);
+			return (1);
+		}
 	}
-    }
-
-    if (buf != NULL)
-      free (buf);
 
-    return retval;
+	/* No match. */
+	freeaddrinfo(res);
+	return (0);
 }