mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-10 19:30:10 +00:00
11bf311edc
2007-01-11 Jakub Jelinek <jakub@redhat.com> * sysdeps/i386/soft-fp/sfp-machine.h: Remove. * sysdeps/x86_64/soft-fp/sfp-machine.h: Likewise. 2007-01-10 Ulrich Drepper <drepper@redhat.com> * io/fts.c: Make sure fts_cur is always valid after return from fts_read. Patch by Miloslav Trmac <mitr@redhat.com>. 2006-10-27 Richard Sandiford <richard@codesourcery.com> * elf/elf.h (R_MIPS_GLOB_DAT): Define. (R_MIPS_NUM): Bump by 1. 2007-01-03 Jakub Jelinek <jakub@redhat.com> * posix/execvp.c: Include alloca.h. (allocate_scripts_argv): Renamed to... (scripts_argv): ... this. Don't allocate buffer here nor count arguments. (execvp): Use alloca if possible. * posix/Makefile: Add rules to build and run tst-vfork3 test. * posix/tst-vfork3.c: New test. * stdlib/Makefile (tst-strtod3-ENV): Define. 2007-01-02 Ulrich Drepper <drepper@redhat.com> * posix/getconf.c: Update copyright year. * nss/getent.c: Likewise. * iconv/iconvconfig.c: Likewise. * iconv/iconv_prog.c: Likewise. * elf/ldconfig.c: Likewise. * catgets/gencat.c: Likewise. * csu/version.c: Likewise. * elf/ldd.bash.in: Likewise. * elf/sprof.c (print_version): Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * nscd/nscd.c (print_version): Likewise. * debug/xtrace.sh: Likewise. * malloc/memusage.sh: Likewise. * malloc/mtrace.pl: Likewise. * debug/catchsegv.sh: Likewise. 2006-12-24 Ulrich Drepper <drepper@redhat.com> * malloc/malloc.c (sYSMALLOc): Remove some unnecessary alignment attempts. 2006-12-23 Ulrich Drepper <drepper@redhat.com> * posix/wordexp.c: Remove some unnecessary tests. 2006-12-20 SUGIOKA Toshinobu <sugioka@itonet.co.jp> * sysdeps/unix/sysv/linux/sh/bits/shm.h: New file. * nss/getXXbyYY_r.c: Include atomic.h. (INTERNAL (REENTRANT_NAME)): Write startp after start_fct, add atomic_write_barrier () in between. 2006-11-28 Jakub Jelinek <jakub@redhat.com> * elf/dl-support.c: Include dl-procinfo.h. * sysdeps/powerpc/dl-procinfo.h (PPC_PLATFORM_POWER4, PPC_PLATFORM_PPC970, PPC_PLATFORM_POWER5, PPC_PLATFORM_POWER5_PLUS, PPC_PLATFORM_POWER6, PPC_PLATFORM_CELL_BE, PPC_PLATFORM_POWER6X): Define. (_dl_string_platform): Use PPC_PLATFORM_* macros instead of hardcoded constants. * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_platform): Use PPC_PLATFORM_* macros for array designators. 2006-11-11 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_cap_flags): Add 3 new cap names to the beginning. (_dl_powerpc_platforms): Add "power6x". * sysdeps/powerpc/dl-procinfo.h (_DL_HWCAP_FIRST): Decrease. (HWCAP_IMPORTANT): Add PPC_FEATURE_HAS_DFP. (_DL_PLATFORMS_COUNT): Increase. (_dl_string_platform): Handle power6x case. * sysdeps/powerpc/sysdep.h (PPC_FEATURE_PA6T, PPC_FEATURE_HAS_DFP, PPC_FEATURE_POWER6_EXT): Define. (PPC_FEATURE_POWER5, PPC_FEATURE_POWER5_PLUS): Correct Comment. [-2^31 .. 2^31) range. * sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_RELATIME. * sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags): Handle relatime mount option. 2006-12-13 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Include kernel-features.h. 2006-12-11 Ulrich Drepper <drepper@redhat.com> * stdlib/strtod_l.c (____STRTOF_INTERNAL): Parse thousand separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. [BZ #3664] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix test to recognize empty parsed strings. * stdlib/Makefile (tests): Add tst-strtod2. * stdlib/tst-strtod2.c: New file. [BZ #3673] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix exp_limit computation. * stdlib/Makefile (tests): Add tst-atof2. * stdlib/tst-atof2.c: New file. [BZ #3674] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Adjust exponent value correctly if removing trailing zero of hex-float. * stdlib/Makefile (tests): Add tst-atof1. * stdlib/tst-atof1.c: New file. * misc/mntent_r.c (__hasmntopt): Check p[optlen] even when p == rest. Start searching for next comma at p rather than rest. * misc/Makefile (tests): Add tst-mntent2. * misc/tst-mntent2.c: New test. 2006-12-08 Ulrich Drepper <drepper@redhat.com> * malloc/memusage.c: Handle realloc with new size of zero and non-NULL pointer correctly. (me): Really write first record twice. (struct entry): Make format bi-arch safe. (dest): Write out more realloc statistics. * malloc/memusagestat.c (struct entry): Make format bi-arch safe. 2006-12-05 Jakub Jelinek <jakub@redhat.com> * nis/nis_subr.c (nis_getnames): Revert last change. 2006-12-03 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/unix/sysv/linux/sh/sys/io.h: Removed. 2006-11-30 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/i386/i686/memcmp.S: Use jump table as the base of jump table entries. 2006-11-30 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/i386/clone.S: Provide CFI for the outermost `clone' function to ensure proper unwinding stop of gdb. * sysdeps/unix/sysv/linux/x86_64/clone.S: Likewise. 2006-12-01 Ulrich Drepper <drepper@redhat.com> * nscd/nscd.init: Remove obsolete and commented-out -S option handling. 2006-11-23 Jakub Jelinek <jakub@redhat.com> [BZ #3514] * manual/string.texi (strncmp): Fix pastos from wcscmp description. [BZ #3515] * manual/string.texi (strtok): Remove duplicate paragraph. 2006-12-01 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with libgcc not supporting `rflags' unwinding (register # >= 17). 2006-11-30 Jakub Jelinek <jakub@redhat.com> * sunrpc/svc_run.c (svc_run): Set my_pollfd to new_pollfd if realloc succeeded. 2006-11-29 Daniel Jacobowitz <dan@codesourcery.com> Jakub Jelinek <jakub@redhat.com> Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c (restore_rt): Add correct unwind information. * sysdeps/unix/sysv/linux/x86_64/Makefile: Provide symbols for 'restore_rt' even in the 'signal' directory. * sysdeps/unix/sysv/linux/x86_64/ucontext_i.sym: Extend the regs list. malloc crashed. Don't allocate memory unnecessarily in each loop. 2006-10-21 Jakub Jelinek <jakub@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Fix last change. 2006-11-20 Ulrich Drepper <drepper@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Optimize a bit. 2006-11-18 Bruno Haible <bruno@clisp.org> * sysdeps/unix/sysv/linux/i386/getgroups.c (__getgroups): Invoke __sysconf only after having tried to call getgroups32. 2006-11-19 Ulrich Drepper <drepper@redhat.com> * nss/nss_files/files-hosts.c (LINE_PARSER): Support IPv6-style addresses for IPv4 queries if they can be mapped. 2006-11-16 Jakub Jelinek <jakub@redhat.com> * sysdeps/x86_64/fpu/s_copysignf.S (__copysignf): Switch to .text. * sysdeps/x86_64/fpu/s_copysign.S (__copysign): Likewise. (signmask): Add .size directive. (othermask): Add .type directive. 2006-11-14 Ulrich Drepper <drepper@redhat.com> * po/nl.po: Update from translation team. * timezone/zdump.c: Redo fix for BZ #3137. 2006-11-14 Jakub Jelinek <jakub@redhat.com> * nss/nss_files/files-alias.c (get_next_alias): Set line back to first_unused after parsing :include: file. * timezone/africa: Update from tzdata2006o. * timezone/antarctica: Likewise. * timezone/asia: Likewise. * timezone/australasia: Likewise. * timezone/backward: Likewise. * timezone/europe: Likewise. * timezone/iso3166.tab: Likewise. * timezone/northamerica: Likewise. * timezone/southamerica: Likewise. * timezone/zone.tab: Likewise. * time/tzfile.c (__tzfile_read): Extend to handle new file format on machines with 64-bit time_t. * timezone/checktab.awk: Update from tzcode2006o. * timezone/ialloc.c: Likewise. * timezone/private.h: Likewise. * timezone/scheck.c: Likewise. * timezone/tzfile.h: Likewise. * timezone/tzselect.ksh: Likewise. * timezone/zdump.c: Likewise. * timezone/zic.c: Likewise. [BZ #3483] * elf/ldconfig.c (main): Call setlocale and textdomain. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. [BZ #3480] * manual/argp.texi: Fix typos. * manual/charset.texi: Likewise. * manual/errno.texi: Likewise. * manual/filesys.texi: Likewise. * manual/lang.texi: Likewise. * manual/maint.texi: Likewise. * manual/memory.texi: Likewise. * manual/message.texi: Likewise. * manual/resource.texi: Likewise. * manual/search.texi: Likewise. * manual/signal.texi: Likewise. * manual/startup.texi: Likewise. * manual/stdio.texi: Likewise. * manual/sysinfo.texi: Likewise. * manual/syslog.texi: Likewise. * manual/time.texi: Likewise. Patch by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>. [BZ #3465] * sunrpc/clnt_raw.c: Minimal message improvements. * sunrpc/pm_getmaps.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/nis_print_group_entry.c: Likewise. * locale/programs/repertoire.c: Likewise. * locale/programs/charmap.c: Likewise. * malloc/memusage.sh: Likewise. * elf/dl-deps.c: Likewise. * locale/programs/ld-collate.c: Likewise. * libio/vswprintf.c: Likewise. * malloc/memusagestat.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/rpc_main.c: Likewise. * nscd/cache.c: Likewise. * locale/programs/repertoire.c: Unify output messages. * locale/programs/charmap.c: Likewise. * locale/programs/ld-ctype.c: Likewise. * locale/programs/ld-monetary.c: Likewise. * locale/programs/ld-numeric.c: Likewise. * locale/programs/ld-time.c: Likewise. * elf/ldconfig.c: Likewise. * nscd/selinux.c: Likewise. * elf/cache.c: Likewise. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. 2006-11-10 Jakub Jelinek <jakub@redhat.com> * string/strxfrm_l.c (STRXFRM): Fix trailing \1 optimization if N is one bigger than return value. * string/tst-strxfrm2.c (do_test): Also test strxfrm with l1 + 1 and l1 last arguments, if buf is defined, verify the return value equals to strlen (buf) and verify no byte beyond passed length is modified. 2006-11-10 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. * sysdeps/gnu/siglist.c (__old_sys_siglist, __old_sys_sigabbrev): Use __new_sys_siglist instead of _sys_siglist_internal as second macro argument. (_old_sys_siglist): Use declare_symbol_alias macro instead of strong_alias. 2006-11-09 Ulrich Drepper <drepper@redhat.com> [BZ #3493] * posix/unistd.h (sysconf): Remove const attribute. * sysdeps/posix/getaddrinfo.c (getaddrinfo): Fix test for temporary or deprecated addresses. Patch by Sridhar Samudrala <sri@us.ibm.com>. * string/Makefile (tests): Add tst-strxfrm2. * string/tst-strxfrm2.c: New file. 2006-10-09 Jakub Jelinek <jakub@redhat.com> * elf/dl-debug.c (_dl_debug_initialize): Check r->r_map for 0 rather than r->r_brk. * string/strxfrm_l.c (STRXFRM): Do the trailing \1 removal optimization even if needed > n. 2006-11-07 Jakub Jelinek <jakub@redhat.com> * include/libc-symbols.h (declare_symbol): Rename to... (declare_symbol_alias): ... this. Add ORIGINAL argument, imply strong_alias (ORIGINAL, SYMBOL) in asm to make sure it preceedes .size directive. * sysdeps/gnu/errlist-compat.awk: Adjust for declare_symbol_alias changes. * sysdeps/gnu/siglist.c: Likewise. 2006-11-03 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/fpu/bits/mathinline.h [__LIBC_INTERNAL_MATH_INLINES]: Moved to ... * sysdeps/powerpc/fpu/math_private.h: ...here. New file. 2006-11-05 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Update handling of cache descriptor 0x49 for new models. * sysdeps/unix/sysv/linux/x86_64/sysconf.c (intel_check_word): Likewise. 2006-11-02 Ulrich Drepper <drepper@redhat.com> * configure.in: Work around ld --help change and avoid -z relro test completely if the architecture doesn't care about security. 2006-11-01 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. 2006-10-31 Ulrich Drepper <drepper@redhat.com> * stdlib/atexit.c (atexit): Don't mark as hidden when used to generate compatibility version. 2006-10-29 Ulrich Drepper <drepper@redhat.com> * configure.in: Relax -z relro requirement a bit. * po/sv.po: Update from translation team. 2006-10-29 Jakub Jelinek <jakub@redhat.com> * elf/dl-sym.c (do_sym): Use RTLD_SINGLE_THREAD_P. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Likewise. * elf/dl-close.c (_dl_close_worker): Likewise. * elf/dl-open.c (_dl_open_worker): Likewise. * sysdeps/generic/sysdep-cancel.h (RTLD_SINGLE_THREAD_P): Define. * configure.in: Require assembler support for visibility, compiler support for visibility and aliases, linker support for various -z options. * Makeconfig: Remove conditional code which now is unnecessary. * config.h.in: Likewise. * config.make.in: Likewise. * dlfcn/Makefile: Likewise. * elf/Makefile: Likewise. * elf/dl-load.c: Likewise. * elf/rtld.c: Likewise. * include/libc-symbols.h: Likewise. * include/stdio.h: Likewise. * io/Makefile: Likewise. * io/fstat.c: Likewise. * io/fstat64.c: Likewise. * io/fstatat.c: Likewise. * io/fstatat64.c: Likewise. * io/lstat.c: Likewise. * io/lstat64.c: Likewise. * io/mknod.c: Likewise. * io/mknodat.c: Likewise. * io/stat.c: Likewise. * io/stat64.c: Likewise. * libio/stdio.c: Likewise. * nscd/Makefile: Likewise. * stdlib/Makefile: Likewise. * stdlib/atexit.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/i386/sysdep.h: Likewise. * sysdeps/i386/i686/memcmp.S: Likewise. * sysdeps/powerpc/powerpc32/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise. * Makerules: USE_TLS support is now default. * tls.make.c: Likewise. * csu/Versions: Likewise. * csu/libc-start.c: Likewise. * csu/libc-tls.c: Likewise. * csu/version.c: Likewise. * dlfcn/dlinfo.c: Likewise. * elf/dl-addr.c: Likewise. * elf/dl-cache.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-object.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-sysdep.c: Likewise. * elf/dl-tls.c: Likewise. * elf/ldconfig.c: Likewise. * elf/rtld.c: Likewise. * elf/tst-tls-dlinfo.c: Likewise. * elf/tst-tls1.c: Likewise. * elf/tst-tls10.h: Likewise. * elf/tst-tls14.c: Likewise. * elf/tst-tls2.c: Likewise. * elf/tst-tls3.c: Likewise. * elf/tst-tls4.c: Likewise. * elf/tst-tls5.c: Likewise. * elf/tst-tls6.c: Likewise. * elf/tst-tls7.c: Likewise. * elf/tst-tls8.c: Likewise. * elf/tst-tls9.c: Likewise. * elf/tst-tlsmod1.c: Likewise. * elf/tst-tlsmod13.c: Likewise. * elf/tst-tlsmod13a.c: Likewise. * elf/tst-tlsmod14a.c: Likewise. * elf/tst-tlsmod2.c: Likewise. * elf/tst-tlsmod3.c: Likewise. * elf/tst-tlsmod4.c: Likewise. * elf/tst-tlsmod5.c: Likewise. * elf/tst-tlsmod6.c: Likewise. * include/errno.h: Likewise. * include/link.h: Likewise. * include/tls.h: Likewise. * locale/global-locale.c: Likewise. * locale/localeinfo.h: Likewise. * malloc/arena.c: Likewise. * malloc/hooks.c: Likewise. * malloc/malloc.c: Likewise. * resolv/Versions: Likewise. * sysdeps/alpha/dl-machine.h: Likewise. * sysdeps/alpha/libc-tls.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/tls.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/ia64/dl-machine.h: Likewise. * sysdeps/ia64/libc-tls.c: Likewise. * sysdeps/mach/hurd/fork.c: Likewise. * sysdeps/mach/hurd/i386/tls.h: Likewise. * sysdeps/powerpc/powerpc32/dl-machine.c: Likwise. * sysdeps/powerpc/powerpc32/dl-machine.h: Likewise. * sysdeps/powerpc/powerpc64/dl-machine.h: Likewise. * sysdeps/s390/libc-tls.c: Likewise. * sysdeps/s390/s390-32/dl-machine.h: Likewise. * sysdeps/s390/s390-64/dl-machine.h: Likewise. * sysdeps/sh/dl-machine.h: Likewise. * sysdeps/sparc/sparc32/dl-machine.h: Likewise. * sysdeps/sparc/sparc64/dl-machine.h: Likewise. * sysdeps/x86_64/dl-machine.h: Likewise. [BZ #3426] * stdlib/stdlib.h: Adjust comment for canonicalize_file_name to reality. 2006-10-27 Jakub Jelinek <jakub@redhat.com> * elf/dl-lookup.c (_dl_debug_bindings): Remove unused symbol_scope argument. (_dl_lookup_symbol_x): Adjust caller. * sysdeps/generic/ldsodefs.h (struct link_namespaces): Remove _ns_global_scope. * elf/rtld.c (dl_main): Don't initialize _ns_global_scope. * elf/dl-libc.c: Revert l_scope name changes. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * elf/dl-close.c (_dl_close): Likewise. * elf/dl-open.c (dl_open_worker): Likewise. If not SINGLE_THREAD_P, always use __rtld_mrlock_{change,done}. Always free old scope list here if not l_scope_mem. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Revert l_scope name change. Never free scope list here. Just __rtld_mrlock_lock before the lookup and __rtld_mrlock_unlock it after the lookup. * elf/dl-sym.c: Likewise. * include/link.h (struct r_scoperec): Remove. (struct link_map): Replace l_scoperec with l_scope, l_scoperec_mem with l_scope_mem and l_scoperec_lock with l_scope_lock. 2006-10-25 Ulrich Drepper <drepper@redhat.com> * sysdeps/gnu/netinet/tcp.h: Define TCP_CONGESTION. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * configure.in: Disable building profile libraries by default. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * elf/dl-lookup.c (_dl_lookup_symbol_x): Add warning to _dl_lookup_symbol_x code. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * elf/dl-runtime.c: Include sysdep-cancel.h. (_dl_fixup, _dl_profile_fixup): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-sym.c: Include sysdep-cancel.h. (do_sym): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-close.c: Include sysdep-cancel.h. (_dl_close): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-open.c: Include sysdep-cancel.h. (dl_open_worker): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. 2006-10-17 Jakub Jelinek <jakub@redhat.com> [BZ #3313] * malloc/malloc.c (malloc_consolidate): Set maxfb to address of last fastbin rather than end of fastbin array. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * sysdeps/i386/i486/bits/atomic.h (catomic_decrement): Use correct body macro. * sysdeps/x86_64/bits/atomic.h (__arch_c_compare_and_exchange_val_64_acq): Add missing casts. (catomic_decrement): Use correct body macro. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * include/atomic.h: Add a unique prefix to all local variables in macros. * csu/tst-atomic.c (do_test): Test also catomic_* macros. 2006-10-14 Ulrich Drepper <drepper@redhat.com> * resolv/arpa/nameser.h: Document that ns_t_a6 is deprecated. [BZ #3313] * malloc/malloc.c (malloc_consolidate): Don't use get_fast_max to determine highest fast bin to consolidate, always look into all of them. (do_check_malloc_state): Only require for empty bins for large sizes in main arena. * libio/stdio.h: Add more __wur attributes. 2006-11-12 Andreas Jaeger <aj@suse.de> [BZ #2510] * manual/search.texi (Hash Search Function): Clarify. (Array Search Function): Clarify. 2006-11-12 Joseph Myers <joseph@codesourcery.com> [BZ #2830] * math/atest-exp.c (main): Cast hex value to mp_limb_t before shifting. * math/atest-exp2.c (read_mpn_hex): Likewise. * math/atest-sincos.c (main): Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Add epoll_pwait. * sysdeps/unix/sysv/linux/sys/epoll.h: Declare epoll_pwait. * sysdeps/unix/sysv/linux/Versions (libc): Add epoll_pwait for version GLIBC_2.6. * Versions.def: Add GLIBC_2.6 for libc. * sysdeps/i386/i486/bits/atomic.h: Add catomic_* support. 2006-10-11 Jakub Jelinek <jakub@redhat.com> * malloc/malloc.c (_int_malloc): Remove unused any_larger variable. * nis/nis_defaults.c (__nis_default_access): Don't call getenv twice. * nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv. * sysdeps/generic/unsecvars.h: Add NIS_PATH. 2006-10-11 Ulrich Drepper <drepper@redhat.com> * include/atomic.c: Define catomic_* operations. * sysdeps/x86_64/bits/atomic.h: Likewise. Fix a few minor problems. * stdlib/cxa_finalize.c: Use catomic_* operations instead of atomic_*. * malloc/memusage.c: Likewise. * gmon/mcount.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-profile.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-runtime.c: Likewise. * elf/dl-fptr.c: Likewise. * resolv/res_libc.c: Likewise. 2006-10-10 Roland McGrath <roland@frob.com> * sysdeps/mach/hurd/utimes.c: Use a union to avoid an improper cast. * sysdeps/mach/hurd/futimes.c: Likewise. * sysdeps/mach/hurd/lutimes.c: Likewise. 2006-10-09 Ulrich Drepper <drepper@redhat.com> Jakub Jelinek <jakub@redhat.com> Implement reference counting of scope records. * elf/dl-close.c (_dl_close): Remove all scopes from removed objects from the list in objects which remain. Always allocate new scope record. * elf/dl-open.c (dl_open_worker): When growing array for scopes, don't resize, allocate a new one. * elf/dl-runtime.c: Update reference counters before using a scope array. * elf/dl-sym.c: Likewise. * elf/dl-libc.c: Adjust for l_scope name change. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * include/link.h: Include <rtld-lowlevel.h>. Define struct r_scoperec. Replace r_scope with pointer to r_scoperec structure. Add l_scoperec_lock. * sysdeps/generic/ldsodefs.h: Include <rtld-lowlevel.h>. * sysdeps/generic/rtld-lowlevel.h: New file. * include/atomic.h: Rename atomic_and to atomic_and_val and atomic_or to atomic_or_val. Define new macros atomic_and and atomic_or which do not return values. * sysdeps/x86_64/bits/atomic.h: Define atomic_and and atomic_or. Various cleanups. * sysdeps/i386/i486/bits/atomic.h: Likewise. * po/sv.po: Update from translation team. 2006-10-07 Ulrich Drepper <drepper@redhat.com> * Versions.def: Add GLIBC_2.6 to libpthread. * include/shlib-compat.h (SHLIB_COMPAT): Expand parameters before use. (versioned_symbol): Likewise. (compat_symbol): Likewise. * po/tr.po: Update from translation team. * nis/Banner: Removed. It's been integral part forever and the author info is incomplete anyway. * libio/Banner: Likewise. 2006-10-06 Ulrich Drepper <drepper@redhat.com> * version.h (VERSION): Bump to 2.5.90 for new development tree.
836 lines
23 KiB
C
836 lines
23 KiB
C
/* Copyright (C) 1996-2003, 2004 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Extended from original form by Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
/* Parts of this file are plain copies of the file `gethtnamadr.c' from
|
|
the bind package and it has the following copyright. */
|
|
|
|
/*
|
|
* ++Copyright++ 1985, 1988, 1993
|
|
* -
|
|
* Copyright (c) 1985, 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.
|
|
* 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--
|
|
*/
|
|
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <netdb.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <stddef.h>
|
|
#include <string.h>
|
|
#include <sys/syslog.h>
|
|
|
|
#include "nsswitch.h"
|
|
|
|
/* Get implementation for some internal functions. */
|
|
#include <resolv/mapv4v6addr.h>
|
|
#include <resolv/mapv4v6hostent.h>
|
|
|
|
#define RESOLVSORT
|
|
|
|
/* Maximum number of aliases we allow. */
|
|
#define MAX_NR_ALIASES 48
|
|
#define MAX_NR_ADDRS 48
|
|
|
|
#if PACKETSZ > 65536
|
|
# define MAXPACKET PACKETSZ
|
|
#else
|
|
# define MAXPACKET 65536
|
|
#endif
|
|
/* As per RFC 1034 and 1035 a host name cannot exceed 255 octets in length. */
|
|
#ifdef MAXHOSTNAMELEN
|
|
# undef MAXHOSTNAMELEN
|
|
#endif
|
|
#define MAXHOSTNAMELEN 256
|
|
|
|
static const char AskedForGot[] = "\
|
|
gethostby*.getanswer: asked for \"%s\", got \"%s\"";
|
|
|
|
|
|
/* We need this time later. */
|
|
typedef union querybuf
|
|
{
|
|
HEADER hdr;
|
|
u_char buf[MAXPACKET];
|
|
} querybuf;
|
|
|
|
/* These functions are defined in res_comp.c. */
|
|
#define NS_MAXCDNAME 255 /* maximum compressed domain name */
|
|
extern int __ns_name_ntop (const u_char *, char *, size_t);
|
|
extern int __ns_name_unpack (const u_char *, const u_char *,
|
|
const u_char *, u_char *, size_t);
|
|
|
|
|
|
static enum nss_status getanswer_r (const querybuf *answer, int anslen,
|
|
const char *qname, int qtype,
|
|
struct hostent *result, char *buffer,
|
|
size_t buflen, int *errnop, int *h_errnop,
|
|
int map, int32_t *ttlp, char **canonp);
|
|
|
|
extern enum nss_status _nss_dns_gethostbyname3_r (const char *name, int af,
|
|
struct hostent *result,
|
|
char *buffer, size_t buflen,
|
|
int *errnop, int *h_errnop,
|
|
int32_t *ttlp,
|
|
char **canonp);
|
|
hidden_proto (_nss_dns_gethostbyname3_r)
|
|
|
|
enum nss_status
|
|
_nss_dns_gethostbyname3_r (const char *name, int af, struct hostent *result,
|
|
char *buffer, size_t buflen, int *errnop,
|
|
int *h_errnop, int32_t *ttlp, char **canonp)
|
|
{
|
|
union
|
|
{
|
|
querybuf *buf;
|
|
u_char *ptr;
|
|
} host_buffer;
|
|
querybuf *orig_host_buffer;
|
|
char tmp[NS_MAXDNAME];
|
|
int size, type, n;
|
|
const char *cp;
|
|
int map = 0;
|
|
int olderr = errno;
|
|
enum nss_status status;
|
|
|
|
if (__res_maybe_init (&_res, 0) == -1)
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
switch (af) {
|
|
case AF_INET:
|
|
size = INADDRSZ;
|
|
type = T_A;
|
|
break;
|
|
case AF_INET6:
|
|
size = IN6ADDRSZ;
|
|
type = T_AAAA;
|
|
break;
|
|
default:
|
|
*h_errnop = NO_DATA;
|
|
*errnop = EAFNOSUPPORT;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
result->h_addrtype = af;
|
|
result->h_length = size;
|
|
|
|
/*
|
|
* if there aren't any dots, it could be a user-level alias.
|
|
* this is also done in res_query() since we are not the only
|
|
* function that looks up host names.
|
|
*/
|
|
if (strchr (name, '.') == NULL
|
|
&& (cp = res_hostalias (&_res, name, tmp, sizeof (tmp))) != NULL)
|
|
name = cp;
|
|
|
|
host_buffer.buf = orig_host_buffer = (querybuf *) alloca (1024);
|
|
|
|
n = __libc_res_nsearch (&_res, name, C_IN, type, host_buffer.buf->buf,
|
|
1024, &host_buffer.ptr);
|
|
if (n < 0)
|
|
{
|
|
enum nss_status status = (errno == ECONNREFUSED
|
|
? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND);
|
|
*h_errnop = h_errno;
|
|
if (h_errno == TRY_AGAIN)
|
|
*errnop = EAGAIN;
|
|
else
|
|
__set_errno (olderr);
|
|
|
|
/* If we are looking for a IPv6 address and mapping is enabled
|
|
by having the RES_USE_INET6 bit in _res.options set, we try
|
|
another lookup. */
|
|
if (af == AF_INET6 && (_res.options & RES_USE_INET6))
|
|
n = __libc_res_nsearch (&_res, name, C_IN, T_A, host_buffer.buf->buf,
|
|
host_buffer.buf != orig_host_buffer
|
|
? MAXPACKET : 1024, &host_buffer.ptr);
|
|
|
|
if (n < 0)
|
|
{
|
|
if (host_buffer.buf != orig_host_buffer)
|
|
free (host_buffer.buf);
|
|
return status;
|
|
}
|
|
|
|
map = 1;
|
|
|
|
result->h_addrtype = AF_INET;
|
|
result->h_length = INADDRSZ;;
|
|
}
|
|
|
|
status = getanswer_r (host_buffer.buf, n, name, type, result, buffer, buflen,
|
|
errnop, h_errnop, map, ttlp, canonp);
|
|
if (host_buffer.buf != orig_host_buffer)
|
|
free (host_buffer.buf);
|
|
return status;
|
|
}
|
|
hidden_def (_nss_dns_gethostbyname3_r)
|
|
|
|
|
|
enum nss_status
|
|
_nss_dns_gethostbyname2_r (const char *name, int af, struct hostent *result,
|
|
char *buffer, size_t buflen, int *errnop,
|
|
int *h_errnop)
|
|
{
|
|
return _nss_dns_gethostbyname3_r (name, af, result, buffer, buflen, errnop,
|
|
h_errnop, NULL, NULL);
|
|
}
|
|
|
|
|
|
enum nss_status
|
|
_nss_dns_gethostbyname_r (const char *name, struct hostent *result,
|
|
char *buffer, size_t buflen, int *errnop,
|
|
int *h_errnop)
|
|
{
|
|
enum nss_status status = NSS_STATUS_NOTFOUND;
|
|
|
|
if (_res.options & RES_USE_INET6)
|
|
status = _nss_dns_gethostbyname3_r (name, AF_INET6, result, buffer,
|
|
buflen, errnop, h_errnop, NULL, NULL);
|
|
if (status == NSS_STATUS_NOTFOUND)
|
|
status = _nss_dns_gethostbyname3_r (name, AF_INET, result, buffer,
|
|
buflen, errnop, h_errnop, NULL, NULL);
|
|
|
|
return status;
|
|
}
|
|
|
|
|
|
enum nss_status
|
|
_nss_dns_gethostbyaddr_r (const void *addr, socklen_t len, int af,
|
|
struct hostent *result, char *buffer, size_t buflen,
|
|
int *errnop, int *h_errnop)
|
|
{
|
|
static const u_char mapped[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0xff,0xff };
|
|
static const u_char tunnelled[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0,0 };
|
|
static const u_char v6local[] = { 0,0, 0,1 };
|
|
const u_char *uaddr = (const u_char *)addr;
|
|
struct host_data
|
|
{
|
|
char *aliases[MAX_NR_ALIASES];
|
|
unsigned char host_addr[16]; /* IPv4 or IPv6 */
|
|
char *h_addr_ptrs[MAX_NR_ADDRS + 1];
|
|
char linebuffer[0];
|
|
} *host_data = (struct host_data *) buffer;
|
|
union
|
|
{
|
|
querybuf *buf;
|
|
u_char *ptr;
|
|
} host_buffer;
|
|
querybuf *orig_host_buffer;
|
|
char qbuf[MAXDNAME+1], *qp = NULL;
|
|
size_t size;
|
|
int n, status;
|
|
int olderr = errno;
|
|
|
|
if (__res_maybe_init (&_res, 0) == -1)
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
if (af == AF_INET6 && len == IN6ADDRSZ
|
|
&& (memcmp (uaddr, mapped, sizeof mapped) == 0
|
|
|| (memcmp (uaddr, tunnelled, sizeof tunnelled) == 0
|
|
&& memcmp (&uaddr[sizeof tunnelled], v6local, sizeof v6local))))
|
|
{
|
|
/* Unmap. */
|
|
addr += sizeof mapped;
|
|
uaddr += sizeof mapped;
|
|
af = AF_INET;
|
|
len = INADDRSZ;
|
|
}
|
|
|
|
switch (af)
|
|
{
|
|
case AF_INET:
|
|
size = INADDRSZ;
|
|
break;
|
|
case AF_INET6:
|
|
size = IN6ADDRSZ;
|
|
break;
|
|
default:
|
|
*errnop = EAFNOSUPPORT;
|
|
*h_errnop = NETDB_INTERNAL;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
if (size > len)
|
|
{
|
|
*errnop = EAFNOSUPPORT;
|
|
*h_errnop = NETDB_INTERNAL;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
host_buffer.buf = orig_host_buffer = (querybuf *) alloca (1024);
|
|
|
|
switch (af)
|
|
{
|
|
case AF_INET:
|
|
sprintf (qbuf, "%u.%u.%u.%u.in-addr.arpa", (uaddr[3] & 0xff),
|
|
(uaddr[2] & 0xff), (uaddr[1] & 0xff), (uaddr[0] & 0xff));
|
|
break;
|
|
case AF_INET6:
|
|
/* Only lookup with the byte string format if the user wants it. */
|
|
if (__builtin_expect (_res.options & RES_USEBSTRING, 0))
|
|
{
|
|
qp = stpcpy (qbuf, "\\[x");
|
|
for (n = 0; n < IN6ADDRSZ; ++n)
|
|
qp += sprintf (qp, "%02hhx", uaddr[n]);
|
|
strcpy (qp, "].ip6.arpa");
|
|
n = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR,
|
|
host_buffer.buf->buf, 1024, &host_buffer.ptr);
|
|
if (n >= 0)
|
|
goto got_it_already;
|
|
}
|
|
qp = qbuf;
|
|
for (n = IN6ADDRSZ - 1; n >= 0; n--)
|
|
{
|
|
static const char nibblechar[16] = "0123456789abcdef";
|
|
*qp++ = nibblechar[uaddr[n] & 0xf];
|
|
*qp++ = '.';
|
|
*qp++ = nibblechar[(uaddr[n] >> 4) & 0xf];
|
|
*qp++ = '.';
|
|
}
|
|
strcpy(qp, "ip6.arpa");
|
|
break;
|
|
default:
|
|
/* Cannot happen. */
|
|
break;
|
|
}
|
|
|
|
n = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, host_buffer.buf->buf,
|
|
1024, &host_buffer.ptr);
|
|
if (n < 0 && af == AF_INET6 && (_res.options & RES_NOIP6DOTINT) == 0)
|
|
{
|
|
strcpy (qp, "ip6.int");
|
|
n = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, host_buffer.buf->buf,
|
|
host_buffer.buf != orig_host_buffer
|
|
? MAXPACKET : 1024, &host_buffer.ptr);
|
|
}
|
|
if (n < 0)
|
|
{
|
|
*h_errnop = h_errno;
|
|
__set_errno (olderr);
|
|
if (host_buffer.buf != orig_host_buffer)
|
|
free (host_buffer.buf);
|
|
return errno == ECONNREFUSED ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND;
|
|
}
|
|
|
|
got_it_already:
|
|
status = getanswer_r (host_buffer.buf, n, qbuf, T_PTR, result, buffer, buflen,
|
|
errnop, h_errnop, 0 /* XXX */, NULL, NULL);
|
|
if (host_buffer.buf != orig_host_buffer)
|
|
free (host_buffer.buf);
|
|
if (status != NSS_STATUS_SUCCESS)
|
|
{
|
|
*h_errnop = h_errno;
|
|
*errnop = errno;
|
|
return status;
|
|
}
|
|
|
|
#ifdef SUNSECURITY
|
|
This is not implemented because it is not possible to use the current
|
|
source from bind in a multi-threaded program.
|
|
#endif
|
|
|
|
result->h_addrtype = af;
|
|
result->h_length = len;
|
|
memcpy (host_data->host_addr, addr, len);
|
|
host_data->h_addr_ptrs[0] = (char *) host_data->host_addr;
|
|
host_data->h_addr_ptrs[1] = NULL;
|
|
#if 0
|
|
/* XXX I think this is wrong. Why should an IPv4 address be
|
|
converted to IPv6 if the user explicitly asked for IPv4? */
|
|
if (af == AF_INET && (_res.options & RES_USE_INET6))
|
|
{
|
|
map_v4v6_address ((char *) host_data->host_addr,
|
|
(char *) host_data->host_addr);
|
|
result->h_addrtype = AF_INET6;
|
|
result->h_length = IN6ADDRSZ;
|
|
}
|
|
#endif
|
|
*h_errnop = NETDB_SUCCESS;
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
#ifdef RESOLVSORT
|
|
static void addrsort (char **ap, int num);
|
|
|
|
static void
|
|
addrsort (char **ap, int num)
|
|
{
|
|
int i, j;
|
|
char **p;
|
|
short aval[MAX_NR_ADDRS];
|
|
int needsort = 0;
|
|
|
|
p = ap;
|
|
if (num > MAX_NR_ADDRS)
|
|
num = MAX_NR_ADDRS;
|
|
for (i = 0; i < num; i++, p++)
|
|
{
|
|
for (j = 0 ; (unsigned)j < _res.nsort; j++)
|
|
if (_res.sort_list[j].addr.s_addr ==
|
|
(((struct in_addr *)(*p))->s_addr & _res.sort_list[j].mask))
|
|
break;
|
|
aval[i] = j;
|
|
if (needsort == 0 && i > 0 && j < aval[i-1])
|
|
needsort = i;
|
|
}
|
|
if (!needsort)
|
|
return;
|
|
|
|
while (needsort++ < num)
|
|
for (j = needsort - 2; j >= 0; j--)
|
|
if (aval[j] > aval[j+1])
|
|
{
|
|
char *hp;
|
|
|
|
i = aval[j];
|
|
aval[j] = aval[j+1];
|
|
aval[j+1] = i;
|
|
|
|
hp = ap[j];
|
|
ap[j] = ap[j+1];
|
|
ap[j+1] = hp;
|
|
}
|
|
else
|
|
break;
|
|
}
|
|
#endif
|
|
|
|
static enum nss_status
|
|
getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
|
|
struct hostent *result, char *buffer, size_t buflen,
|
|
int *errnop, int *h_errnop, int map, int32_t *ttlp, char **canonp)
|
|
{
|
|
struct host_data
|
|
{
|
|
char *aliases[MAX_NR_ALIASES];
|
|
unsigned char host_addr[16]; /* IPv4 or IPv6 */
|
|
char *h_addr_ptrs[0];
|
|
} *host_data = (struct host_data *) buffer;
|
|
int linebuflen = buflen - sizeof (struct host_data);
|
|
register const HEADER *hp;
|
|
const u_char *end_of_message, *cp;
|
|
int n, ancount, qdcount;
|
|
int haveanswer, had_error;
|
|
char *bp, **ap, **hap;
|
|
char tbuf[MAXDNAME];
|
|
const char *tname;
|
|
int (*name_ok) (const char *);
|
|
u_char packtmp[NS_MAXCDNAME];
|
|
int have_to_map = 0;
|
|
int32_t ttl = 0;
|
|
|
|
if (__builtin_expect (linebuflen, 0) < 0)
|
|
{
|
|
/* The buffer is too small. */
|
|
too_small:
|
|
*errnop = ERANGE;
|
|
*h_errnop = NETDB_INTERNAL;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
tname = qname;
|
|
result->h_name = NULL;
|
|
end_of_message = answer->buf + anslen;
|
|
switch (qtype)
|
|
{
|
|
case T_A:
|
|
case T_AAAA:
|
|
name_ok = res_hnok;
|
|
break;
|
|
case T_PTR:
|
|
name_ok = res_dnok;
|
|
break;
|
|
default:
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_UNAVAIL; /* XXX should be abort(); */
|
|
}
|
|
|
|
/*
|
|
* find first satisfactory answer
|
|
*/
|
|
hp = &answer->hdr;
|
|
ancount = ntohs (hp->ancount);
|
|
qdcount = ntohs (hp->qdcount);
|
|
cp = answer->buf + HFIXEDSZ;
|
|
if (__builtin_expect (qdcount, 1) != 1)
|
|
{
|
|
*h_errnop = NO_RECOVERY;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
if (sizeof (struct host_data) + (ancount + 1) * sizeof (char *) >= buflen)
|
|
goto too_small;
|
|
bp = (char *) &host_data->h_addr_ptrs[ancount + 1];
|
|
linebuflen -= (ancount + 1) * sizeof (char *);
|
|
|
|
n = __ns_name_unpack (answer->buf, end_of_message, cp,
|
|
packtmp, sizeof packtmp);
|
|
if (n != -1 && __ns_name_ntop (packtmp, bp, linebuflen) == -1)
|
|
{
|
|
if (__builtin_expect (errno, 0) == EMSGSIZE)
|
|
goto too_small;
|
|
|
|
n = -1;
|
|
}
|
|
|
|
if (n > 0 && bp[0] == '.')
|
|
bp[0] = '\0';
|
|
|
|
if (n < 0 || (*name_ok) (bp) == 0)
|
|
{
|
|
*errnop = errno;
|
|
*h_errnop = NO_RECOVERY;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
cp += n + QFIXEDSZ;
|
|
|
|
if (qtype == T_A || qtype == T_AAAA)
|
|
{
|
|
/* res_send() has already verified that the query name is the
|
|
* same as the one we sent; this just gets the expanded name
|
|
* (i.e., with the succeeding search-domain tacked on).
|
|
*/
|
|
n = strlen (bp) + 1; /* for the \0 */
|
|
if (n >= MAXHOSTNAMELEN)
|
|
{
|
|
*h_errnop = NO_RECOVERY;
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
result->h_name = bp;
|
|
bp += n;
|
|
linebuflen -= n;
|
|
if (linebuflen < 0)
|
|
goto too_small;
|
|
/* The qname can be abbreviated, but h_name is now absolute. */
|
|
qname = result->h_name;
|
|
}
|
|
|
|
ap = host_data->aliases;
|
|
*ap = NULL;
|
|
result->h_aliases = host_data->aliases;
|
|
hap = host_data->h_addr_ptrs;
|
|
*hap = NULL;
|
|
result->h_addr_list = host_data->h_addr_ptrs;
|
|
haveanswer = 0;
|
|
had_error = 0;
|
|
|
|
while (ancount-- > 0 && cp < end_of_message && had_error == 0)
|
|
{
|
|
int type, class;
|
|
|
|
n = __ns_name_unpack (answer->buf, end_of_message, cp,
|
|
packtmp, sizeof packtmp);
|
|
if (n != -1 && __ns_name_ntop (packtmp, bp, linebuflen) == -1)
|
|
{
|
|
if (__builtin_expect (errno, 0) == EMSGSIZE)
|
|
goto too_small;
|
|
|
|
n = -1;
|
|
}
|
|
|
|
if (n < 0 || (*name_ok) (bp) == 0)
|
|
{
|
|
++had_error;
|
|
continue;
|
|
}
|
|
cp += n; /* name */
|
|
type = ns_get16 (cp);
|
|
cp += INT16SZ; /* type */
|
|
class = ns_get16 (cp);
|
|
cp += INT16SZ; /* class */
|
|
ttl = ns_get32 (cp);
|
|
cp += INT32SZ; /* TTL */
|
|
n = ns_get16 (cp);
|
|
cp += INT16SZ; /* len */
|
|
if (class != C_IN)
|
|
{
|
|
/* XXX - debug? syslog? */
|
|
cp += n;
|
|
continue; /* XXX - had_error++ ? */
|
|
}
|
|
|
|
if ((qtype ==T_A || qtype == T_AAAA) && type == T_CNAME)
|
|
{
|
|
if (ap >= &host_data->aliases[MAX_NR_ALIASES - 1])
|
|
continue;
|
|
n = dn_expand (answer->buf, end_of_message, cp, tbuf, sizeof tbuf);
|
|
if (n < 0 || (*name_ok) (tbuf) == 0)
|
|
{
|
|
++had_error;
|
|
continue;
|
|
}
|
|
cp += n;
|
|
/* Store alias. */
|
|
*ap++ = bp;
|
|
n = strlen (bp) + 1; /* For the \0. */
|
|
if (__builtin_expect (n, 0) >= MAXHOSTNAMELEN)
|
|
{
|
|
++had_error;
|
|
continue;
|
|
}
|
|
bp += n;
|
|
linebuflen -= n;
|
|
/* Get canonical name. */
|
|
n = strlen (tbuf) + 1; /* For the \0. */
|
|
if (__builtin_expect (n > linebuflen, 0))
|
|
goto too_small;
|
|
if (__builtin_expect (n, 0) >= MAXHOSTNAMELEN)
|
|
{
|
|
++had_error;
|
|
continue;
|
|
}
|
|
result->h_name = bp;
|
|
bp = __mempcpy (bp, tbuf, n); /* Cannot overflow. */
|
|
linebuflen -= n;
|
|
continue;
|
|
}
|
|
|
|
if (qtype == T_PTR && type == T_CNAME)
|
|
{
|
|
n = dn_expand (answer->buf, end_of_message, cp, tbuf, sizeof tbuf);
|
|
if (n < 0 || res_dnok (tbuf) == 0)
|
|
{
|
|
++had_error;
|
|
continue;
|
|
}
|
|
cp += n;
|
|
/* Get canonical name. */
|
|
n = strlen (tbuf) + 1; /* For the \0. */
|
|
if (__builtin_expect (n > linebuflen, 0))
|
|
goto too_small;
|
|
if (__builtin_expect (n, 0) >= MAXHOSTNAMELEN)
|
|
{
|
|
++had_error;
|
|
continue;
|
|
}
|
|
tname = bp;
|
|
bp = __mempcpy (bp, tbuf, n); /* Cannot overflow. */
|
|
linebuflen -= n;
|
|
continue;
|
|
}
|
|
if (__builtin_expect (type == T_SIG, 0)
|
|
|| __builtin_expect (type == T_KEY, 0)
|
|
|| __builtin_expect (type == T_NXT, 0))
|
|
{
|
|
/* We don't support DNSSEC yet. For now, ignore the record
|
|
and send a low priority message to syslog. */
|
|
syslog (LOG_DEBUG | LOG_AUTH,
|
|
"gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"",
|
|
qname, p_class (C_IN), p_type(qtype), p_type (type));
|
|
cp += n;
|
|
continue;
|
|
}
|
|
|
|
if (type == T_A && qtype == T_AAAA && map)
|
|
have_to_map = 1;
|
|
else if (__builtin_expect (type != qtype, 0))
|
|
{
|
|
syslog (LOG_NOTICE | LOG_AUTH,
|
|
"gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"",
|
|
qname, p_class (C_IN), p_type (qtype), p_type (type));
|
|
cp += n;
|
|
continue; /* XXX - had_error++ ? */
|
|
}
|
|
|
|
switch (type)
|
|
{
|
|
case T_PTR:
|
|
if (__strcasecmp (tname, bp) != 0)
|
|
{
|
|
syslog (LOG_NOTICE | LOG_AUTH, AskedForGot, qname, bp);
|
|
cp += n;
|
|
continue; /* XXX - had_error++ ? */
|
|
}
|
|
|
|
n = __ns_name_unpack (answer->buf, end_of_message, cp,
|
|
packtmp, sizeof packtmp);
|
|
if (n != -1 && __ns_name_ntop (packtmp, bp, linebuflen) == -1)
|
|
{
|
|
if (__builtin_expect (errno, 0) == EMSGSIZE)
|
|
goto too_small;
|
|
|
|
n = -1;
|
|
}
|
|
|
|
if (n < 0 || res_hnok (bp) == 0)
|
|
{
|
|
++had_error;
|
|
break;
|
|
}
|
|
#if MULTI_PTRS_ARE_ALIASES
|
|
cp += n;
|
|
if (haveanswer == 0)
|
|
result->h_name = bp;
|
|
else if (ap < &host_data->aliases[MAXALIASES-1])
|
|
*ap++ = bp;
|
|
else
|
|
n = -1;
|
|
if (n != -1)
|
|
{
|
|
n = strlen (bp) + 1; /* for the \0 */
|
|
if (__builtin_expect (n, 0) >= MAXHOSTNAMELEN)
|
|
{
|
|
++had_error;
|
|
break;
|
|
}
|
|
bp += n;
|
|
linebuflen -= n;
|
|
}
|
|
break;
|
|
#else
|
|
result->h_name = bp;
|
|
if (have_to_map)
|
|
{
|
|
n = strlen (bp) + 1; /* for the \0 */
|
|
if (n >= MAXHOSTNAMELEN)
|
|
{
|
|
++had_error;
|
|
break;
|
|
}
|
|
bp += n;
|
|
linebuflen -= n;
|
|
map_v4v6_hostent (result, &bp, &linebuflen);
|
|
}
|
|
*h_errnop = NETDB_SUCCESS;
|
|
return NSS_STATUS_SUCCESS;
|
|
#endif
|
|
case T_A:
|
|
case T_AAAA:
|
|
if (__builtin_expect (strcasecmp (result->h_name, bp), 0) != 0)
|
|
{
|
|
syslog (LOG_NOTICE | LOG_AUTH, AskedForGot, result->h_name, bp);
|
|
cp += n;
|
|
continue; /* XXX - had_error++ ? */
|
|
}
|
|
if (n != result->h_length)
|
|
{
|
|
cp += n;
|
|
continue;
|
|
}
|
|
if (!haveanswer)
|
|
{
|
|
register int nn;
|
|
|
|
if (ttlp != NULL && ttl != 0)
|
|
*ttlp = ttl;
|
|
if (canonp != NULL)
|
|
*canonp = bp;
|
|
result->h_name = bp;
|
|
nn = strlen (bp) + 1; /* for the \0 */
|
|
bp += nn;
|
|
linebuflen -= nn;
|
|
}
|
|
|
|
linebuflen -= sizeof (align) - ((u_long) bp % sizeof (align));
|
|
bp += sizeof (align) - ((u_long) bp % sizeof (align));
|
|
|
|
if (__builtin_expect (n > linebuflen, 0))
|
|
goto too_small;
|
|
bp = __mempcpy (*hap++ = bp, cp, n);
|
|
cp += n;
|
|
linebuflen -= n;
|
|
break;
|
|
default:
|
|
abort ();
|
|
}
|
|
if (had_error == 0)
|
|
++haveanswer;
|
|
}
|
|
|
|
if (haveanswer > 0)
|
|
{
|
|
*ap = NULL;
|
|
*hap = NULL;
|
|
#if defined RESOLVSORT
|
|
/*
|
|
* Note: we sort even if host can take only one address
|
|
* in its return structures - should give it the "best"
|
|
* address in that case, not some random one
|
|
*/
|
|
if (_res.nsort && haveanswer > 1 && qtype == T_A)
|
|
addrsort (host_data->h_addr_ptrs, haveanswer);
|
|
#endif /*RESOLVSORT*/
|
|
|
|
if (result->h_name == NULL)
|
|
{
|
|
n = strlen (qname) + 1; /* For the \0. */
|
|
if (n > linebuflen)
|
|
goto too_small;
|
|
if (n >= MAXHOSTNAMELEN)
|
|
goto no_recovery;
|
|
result->h_name = bp;
|
|
bp = __mempcpy (bp, qname, n); /* Cannot overflow. */
|
|
linebuflen -= n;
|
|
}
|
|
|
|
if (have_to_map)
|
|
map_v4v6_hostent (result, &bp, &linebuflen);
|
|
*h_errnop = NETDB_SUCCESS;
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
no_recovery:
|
|
*h_errnop = NO_RECOVERY;
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|