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.
872 lines
17 KiB
C
872 lines
17 KiB
C
/* Copyright (c) 1998-2006, 2007 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998.
|
|
|
|
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. */
|
|
|
|
/* getent: get entries from administrative database. */
|
|
|
|
#include <aliases.h>
|
|
#include <argp.h>
|
|
#include <ctype.h>
|
|
#include <error.h>
|
|
#include <grp.h>
|
|
#include <libintl.h>
|
|
#include <locale.h>
|
|
#include <mcheck.h>
|
|
#include <netdb.h>
|
|
#include <pwd.h>
|
|
#include <shadow.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <arpa/inet.h>
|
|
#include <arpa/nameser.h>
|
|
#include <netinet/ether.h>
|
|
#include <netinet/in.h>
|
|
#include <sys/socket.h>
|
|
|
|
/* Get libc version number. */
|
|
#include <version.h>
|
|
|
|
#define PACKAGE _libc_intl_domainname
|
|
|
|
/* Name and version of program. */
|
|
static void print_version (FILE *stream, struct argp_state *state);
|
|
void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
|
|
|
|
/* Short description of parameters. */
|
|
static const char args_doc[] = N_("database [key ...]");
|
|
|
|
/* Supported options. */
|
|
static const struct argp_option args_options[] =
|
|
{
|
|
{ "service", 's', "CONFIG", 0, N_("Service configuration to be used") },
|
|
{ NULL, 0, NULL, 0, NULL },
|
|
};
|
|
|
|
/* Short description of program. */
|
|
static const char doc[] = N_("Get entries from administrative database.\v\
|
|
For bug reporting instructions, please see:\n\
|
|
<http://www.gnu.org/software/libc/bugs.html>.\n");
|
|
|
|
/* Prototype for option handler. */
|
|
static error_t parse_option (int key, char *arg, struct argp_state *state);
|
|
|
|
/* Function to print some extra text in the help message. */
|
|
static char *more_help (int key, const char *text, void *input);
|
|
|
|
/* Data structure to communicate with argp functions. */
|
|
static struct argp argp =
|
|
{
|
|
args_options, parse_option, args_doc, doc, NULL, more_help
|
|
};
|
|
|
|
/* Print the version information. */
|
|
static void
|
|
print_version (FILE *stream, struct argp_state *state)
|
|
{
|
|
fprintf (stream, "getent (GNU %s) %s\n", PACKAGE, VERSION);
|
|
fprintf (stream, gettext ("\
|
|
Copyright (C) %s Free Software Foundation, Inc.\n\
|
|
This is free software; see the source for copying conditions. There is NO\n\
|
|
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
|
|
"), "2007");
|
|
fprintf (stream, gettext ("Written by %s.\n"), "Thorsten Kukuk");
|
|
}
|
|
|
|
/* This is for aliases */
|
|
static inline void
|
|
print_aliases (struct aliasent *alias)
|
|
{
|
|
unsigned int i = 0;
|
|
|
|
printf ("%s: ", alias->alias_name);
|
|
for (i = strlen (alias->alias_name); i < 14; ++i)
|
|
fputs_unlocked (" ", stdout);
|
|
|
|
for (i = 0; i < alias->alias_members_len; ++i)
|
|
printf ("%s%s",
|
|
alias->alias_members [i],
|
|
i + 1 == alias->alias_members_len ? "\n" : ", ");
|
|
}
|
|
|
|
static int
|
|
aliases_keys (int number, char *key[])
|
|
{
|
|
int result = 0;
|
|
int i;
|
|
struct aliasent *alias;
|
|
|
|
if (number == 0)
|
|
{
|
|
setaliasent ();
|
|
while ((alias = getaliasent ()) != NULL)
|
|
print_aliases (alias);
|
|
endaliasent ();
|
|
return result;
|
|
}
|
|
|
|
for (i = 0; i < number; ++i)
|
|
{
|
|
alias = getaliasbyname (key[i]);
|
|
|
|
if (alias == NULL)
|
|
result = 2;
|
|
else
|
|
print_aliases (alias);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
/* This is for ethers */
|
|
static int
|
|
ethers_keys (int number, char *key[])
|
|
{
|
|
int result = 0;
|
|
int i;
|
|
|
|
if (number == 0)
|
|
{
|
|
fprintf (stderr, _("Enumeration not supported on %s\n"), "ethers");
|
|
return 3;
|
|
}
|
|
|
|
for (i = 0; i < number; ++i)
|
|
{
|
|
struct ether_addr *ethp, eth;
|
|
char buffer [1024], *p;
|
|
|
|
ethp = ether_aton (key[i]);
|
|
if (ethp != NULL)
|
|
{
|
|
if (ether_ntohost (buffer, ethp))
|
|
{
|
|
result = 2;
|
|
continue;
|
|
}
|
|
p = buffer;
|
|
}
|
|
else
|
|
{
|
|
if (ether_hostton (key[i], ð))
|
|
{
|
|
result = 2;
|
|
continue;
|
|
}
|
|
p = key[i];
|
|
ethp = ð
|
|
}
|
|
printf ("%s %s\n", ether_ntoa (ethp), p);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
/* This is for group */
|
|
static inline void
|
|
print_group (struct group *grp)
|
|
{
|
|
unsigned int i = 0;
|
|
|
|
printf ("%s:%s:%lu:", grp->gr_name ? grp->gr_name : "",
|
|
grp->gr_passwd ? grp->gr_passwd : "",
|
|
(unsigned long int) grp->gr_gid);
|
|
|
|
while (grp->gr_mem[i] != NULL)
|
|
{
|
|
fputs_unlocked (grp->gr_mem[i], stdout);
|
|
++i;
|
|
if (grp->gr_mem[i] != NULL)
|
|
putchar_unlocked (',');
|
|
}
|
|
putchar_unlocked ('\n');
|
|
}
|
|
|
|
static int
|
|
group_keys (int number, char *key[])
|
|
{
|
|
int result = 0;
|
|
int i;
|
|
struct group *grp;
|
|
|
|
if (number == 0)
|
|
{
|
|
setgrent ();
|
|
while ((grp = getgrent ()) != NULL)
|
|
print_group (grp);
|
|
endgrent ();
|
|
return result;
|
|
}
|
|
|
|
for (i = 0; i < number; ++i)
|
|
{
|
|
errno = 0;
|
|
char *ep;
|
|
gid_t arg_gid = strtoul(key[i], &ep, 10);
|
|
|
|
if (errno != EINVAL && *key[i] != '\0' && *ep == '\0')
|
|
/* Valid numeric gid. */
|
|
grp = getgrgid (arg_gid);
|
|
else
|
|
grp = getgrnam (key[i]);
|
|
|
|
if (grp == NULL)
|
|
result = 2;
|
|
else
|
|
print_group (grp);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
/* This is for hosts */
|
|
static void
|
|
print_hosts (struct hostent *host)
|
|
{
|
|
unsigned int cnt;
|
|
|
|
for (cnt = 0; host->h_addr_list[cnt] != NULL; ++cnt)
|
|
{
|
|
char buf[INET6_ADDRSTRLEN];
|
|
const char *ip = inet_ntop (host->h_addrtype, host->h_addr_list[cnt],
|
|
buf, sizeof (buf));
|
|
|
|
printf ("%-15s %s", ip, host->h_name);
|
|
|
|
unsigned int i;
|
|
for (i = 0; host->h_aliases[i] != NULL; ++i)
|
|
{
|
|
putchar_unlocked (' ');
|
|
fputs_unlocked (host->h_aliases[i], stdout);
|
|
}
|
|
putchar_unlocked ('\n');
|
|
}
|
|
}
|
|
|
|
static int
|
|
hosts_keys (int number, char *key[])
|
|
{
|
|
int result = 0;
|
|
int i;
|
|
struct hostent *host;
|
|
|
|
if (number == 0)
|
|
{
|
|
sethostent (0);
|
|
while ((host = gethostent ()) != NULL)
|
|
print_hosts (host);
|
|
endhostent ();
|
|
return result;
|
|
}
|
|
|
|
for (i = 0; i < number; ++i)
|
|
{
|
|
struct hostent *host = NULL;
|
|
char addr[IN6ADDRSZ];
|
|
|
|
if (inet_pton (AF_INET6, key[i], &addr) > 0)
|
|
host = gethostbyaddr (addr, IN6ADDRSZ, AF_INET6);
|
|
else if (inet_pton (AF_INET, key[i], &addr) > 0)
|
|
host = gethostbyaddr (addr, INADDRSZ, AF_INET);
|
|
else if ((host = gethostbyname2 (key[i], AF_INET6)) == NULL)
|
|
host = gethostbyname2 (key[i], AF_INET);
|
|
|
|
if (host == NULL)
|
|
result = 2;
|
|
else
|
|
print_hosts (host);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
/* This is for hosts, but using getaddrinfo */
|
|
static int
|
|
ahosts_keys_int (int af, int xflags, int number, char *key[])
|
|
{
|
|
int result = 0;
|
|
int i;
|
|
struct hostent *host;
|
|
|
|
if (number == 0)
|
|
{
|
|
sethostent (0);
|
|
while ((host = gethostent ()) != NULL)
|
|
print_hosts (host);
|
|
endhostent ();
|
|
return result;
|
|
}
|
|
|
|
struct addrinfo hint;
|
|
memset (&hint, '\0', sizeof (hint));
|
|
hint.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG | AI_CANONNAME | xflags;
|
|
hint.ai_family = af;
|
|
|
|
for (i = 0; i < number; ++i)
|
|
{
|
|
struct addrinfo *res;
|
|
|
|
if (getaddrinfo (key[i], NULL, &hint, &res) != 0)
|
|
result = 2;
|
|
else
|
|
{
|
|
struct addrinfo *runp = res;
|
|
|
|
while (runp != NULL)
|
|
{
|
|
char sockbuf[20];
|
|
const char *sockstr;
|
|
if (runp->ai_socktype == SOCK_STREAM)
|
|
sockstr = "STREAM";
|
|
else if (runp->ai_socktype == SOCK_DGRAM)
|
|
sockstr = "DGRAM";
|
|
else if (runp->ai_socktype == SOCK_RAW)
|
|
sockstr = "RAW";
|
|
else
|
|
{
|
|
snprintf (sockbuf, sizeof (sockbuf), "%d",
|
|
runp->ai_socktype);
|
|
sockstr = sockbuf;
|
|
}
|
|
|
|
char buf[INET6_ADDRSTRLEN];
|
|
printf ("%-15s %-6s %s\n",
|
|
inet_ntop (runp->ai_family,
|
|
runp->ai_family == AF_INET
|
|
? (void *) &((struct sockaddr_in *) runp->ai_addr)->sin_addr
|
|
: (void *) &((struct sockaddr_in6 *) runp->ai_addr)->sin6_addr,
|
|
buf, sizeof (buf)),
|
|
sockstr,
|
|
runp->ai_canonname ?: "");
|
|
|
|
runp = runp->ai_next;
|
|
}
|
|
|
|
freeaddrinfo (res);
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
static int
|
|
ahosts_keys (int number, char *key[])
|
|
{
|
|
return ahosts_keys_int (AF_UNSPEC, 0, number, key);
|
|
}
|
|
|
|
static int
|
|
ahostsv4_keys (int number, char *key[])
|
|
{
|
|
return ahosts_keys_int (AF_INET, 0, number, key);
|
|
}
|
|
|
|
static int
|
|
ahostsv6_keys (int number, char *key[])
|
|
{
|
|
return ahosts_keys_int (AF_INET6, AI_V4MAPPED, number, key);
|
|
}
|
|
|
|
/* This is for netgroup */
|
|
static int
|
|
netgroup_keys (int number, char *key[])
|
|
{
|
|
int result = 0;
|
|
int i;
|
|
|
|
if (number == 0)
|
|
{
|
|
fprintf (stderr, _("Enumeration not supported on %s\n"), "netgroup");
|
|
return 3;
|
|
}
|
|
|
|
for (i = 0; i < number; ++i)
|
|
{
|
|
if (!setnetgrent (key[i]))
|
|
result = 2;
|
|
else
|
|
{
|
|
char *p[3];
|
|
|
|
printf ("%-21s", key[i]);
|
|
|
|
while (getnetgrent (p, p + 1, p + 2))
|
|
printf (" (%s, %s, %s)", p[0] ?: " ", p[1] ?: "", p[2] ?: "");
|
|
putchar_unlocked ('\n');
|
|
}
|
|
}
|
|
|
|
endnetgrent ();
|
|
|
|
return result;
|
|
}
|
|
|
|
/* This is for networks */
|
|
static void
|
|
print_networks (struct netent *net)
|
|
{
|
|
unsigned int i;
|
|
struct in_addr ip;
|
|
ip.s_addr = htonl (net->n_net);
|
|
|
|
printf ("%-21s %s", net->n_name, inet_ntoa (ip));
|
|
|
|
i = 0;
|
|
while (net->n_aliases[i] != NULL)
|
|
{
|
|
putchar_unlocked (' ');
|
|
fputs_unlocked (net->n_aliases[i], stdout);
|
|
++i;
|
|
if (net->n_aliases[i] != NULL)
|
|
putchar_unlocked (',');
|
|
}
|
|
putchar_unlocked ('\n');
|
|
}
|
|
|
|
static int
|
|
networks_keys (int number, char *key[])
|
|
{
|
|
int result = 0;
|
|
int i;
|
|
struct netent *net;
|
|
|
|
if (number == 0)
|
|
{
|
|
setnetent (0);
|
|
while ((net = getnetent ()) != NULL)
|
|
print_networks (net);
|
|
endnetent ();
|
|
return result;
|
|
}
|
|
|
|
for (i = 0; i < number; ++i)
|
|
{
|
|
if (isdigit (key[i][0]))
|
|
net = getnetbyaddr (inet_addr (key[i]), AF_UNIX);
|
|
else
|
|
net = getnetbyname (key[i]);
|
|
|
|
if (net == NULL)
|
|
result = 2;
|
|
else
|
|
print_networks (net);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
/* Now is all for passwd */
|
|
static inline void
|
|
print_passwd (struct passwd *pwd)
|
|
{
|
|
printf ("%s:%s:%lu:%lu:%s:%s:%s\n",
|
|
pwd->pw_name ? pwd->pw_name : "",
|
|
pwd->pw_passwd ? pwd->pw_passwd : "",
|
|
(unsigned long int) pwd->pw_uid,
|
|
(unsigned long int) pwd->pw_gid,
|
|
pwd->pw_gecos ? pwd->pw_gecos : "",
|
|
pwd->pw_dir ? pwd->pw_dir : "",
|
|
pwd->pw_shell ? pwd->pw_shell : "");
|
|
}
|
|
|
|
static int
|
|
passwd_keys (int number, char *key[])
|
|
{
|
|
int result = 0;
|
|
int i;
|
|
struct passwd *pwd;
|
|
|
|
if (number == 0)
|
|
{
|
|
setpwent ();
|
|
while ((pwd = getpwent ()) != NULL)
|
|
print_passwd (pwd);
|
|
endpwent ();
|
|
return result;
|
|
}
|
|
|
|
for (i = 0; i < number; ++i)
|
|
{
|
|
errno = 0;
|
|
char *ep;
|
|
uid_t arg_uid = strtoul(key[i], &ep, 10);
|
|
|
|
if (errno != EINVAL && *key[i] != '\0' && *ep == '\0')
|
|
/* Valid numeric uid. */
|
|
pwd = getpwuid (arg_uid);
|
|
else
|
|
pwd = getpwnam (key[i]);
|
|
|
|
if (pwd == NULL)
|
|
result = 2;
|
|
else
|
|
print_passwd (pwd);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
/* This is for protocols */
|
|
static inline void
|
|
print_protocols (struct protoent *proto)
|
|
{
|
|
unsigned int i;
|
|
|
|
printf ("%-21s %d", proto->p_name, proto->p_proto);
|
|
|
|
i = 0;
|
|
while (proto->p_aliases[i] != NULL)
|
|
{
|
|
putchar_unlocked (' ');
|
|
fputs_unlocked (proto->p_aliases[i], stdout);
|
|
++i;
|
|
}
|
|
putchar_unlocked ('\n');
|
|
}
|
|
|
|
static int
|
|
protocols_keys (int number, char *key[])
|
|
{
|
|
int result = 0;
|
|
int i;
|
|
struct protoent *proto;
|
|
|
|
if (number == 0)
|
|
{
|
|
setprotoent (0);
|
|
while ((proto = getprotoent ()) != NULL)
|
|
print_protocols (proto);
|
|
endprotoent ();
|
|
return result;
|
|
}
|
|
|
|
for (i = 0; i < number; ++i)
|
|
{
|
|
if (isdigit (key[i][0]))
|
|
proto = getprotobynumber (atol (key[i]));
|
|
else
|
|
proto = getprotobyname (key[i]);
|
|
|
|
if (proto == NULL)
|
|
result = 2;
|
|
else
|
|
print_protocols (proto);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
/* Now is all for rpc */
|
|
static inline void
|
|
print_rpc (struct rpcent *rpc)
|
|
{
|
|
int i;
|
|
|
|
printf ("%-15s %d%s",
|
|
rpc->r_name, rpc->r_number, rpc->r_aliases[0] ? " " : "");
|
|
|
|
for (i = 0; rpc->r_aliases[i]; ++i)
|
|
printf (" %s", rpc->r_aliases[i]);
|
|
putchar_unlocked ('\n');
|
|
}
|
|
|
|
static int
|
|
rpc_keys (int number, char *key[])
|
|
{
|
|
int result = 0;
|
|
int i;
|
|
struct rpcent *rpc;
|
|
|
|
if (number == 0)
|
|
{
|
|
setrpcent (0);
|
|
while ((rpc = getrpcent ()) != NULL)
|
|
print_rpc (rpc);
|
|
endrpcent ();
|
|
return result;
|
|
}
|
|
|
|
for (i = 0; i < number; ++i)
|
|
{
|
|
if (isdigit (key[i][0]))
|
|
rpc = getrpcbynumber (atol (key[i]));
|
|
else
|
|
rpc = getrpcbyname (key[i]);
|
|
|
|
if (rpc == NULL)
|
|
result = 2;
|
|
else
|
|
print_rpc (rpc);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
/* for services */
|
|
static void
|
|
print_services (struct servent *serv)
|
|
{
|
|
unsigned int i;
|
|
|
|
printf ("%-21s %d/%s", serv->s_name, ntohs (serv->s_port), serv->s_proto);
|
|
|
|
i = 0;
|
|
while (serv->s_aliases[i] != NULL)
|
|
{
|
|
putchar_unlocked (' ');
|
|
fputs_unlocked (serv->s_aliases[i], stdout);
|
|
++i;
|
|
}
|
|
putchar_unlocked ('\n');
|
|
}
|
|
|
|
static int
|
|
services_keys (int number, char *key[])
|
|
{
|
|
int result = 0;
|
|
int i;
|
|
struct servent *serv;
|
|
|
|
if (!number)
|
|
{
|
|
setservent (0);
|
|
while ((serv = getservent ()) != NULL)
|
|
print_services (serv);
|
|
endservent ();
|
|
return result;
|
|
}
|
|
|
|
for (i = 0; i < number; ++i)
|
|
{
|
|
struct servent *serv;
|
|
char *proto = strchr (key[i], '/');
|
|
|
|
if (proto != NULL)
|
|
*proto++ = '\0';
|
|
|
|
if (isdigit (key[i][0]))
|
|
serv = getservbyport (htons (atol (key[i])), proto);
|
|
else
|
|
serv = getservbyname (key[i], proto);
|
|
|
|
if (serv == NULL)
|
|
result = 2;
|
|
else
|
|
print_services (serv);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
/* This is for shadow */
|
|
static void
|
|
print_shadow (struct spwd *sp)
|
|
{
|
|
printf ("%s:%s:",
|
|
sp->sp_namp ? sp->sp_namp : "",
|
|
sp->sp_pwdp ? sp->sp_pwdp : "");
|
|
|
|
#define SHADOW_FIELD(n) \
|
|
if (sp->n == -1) \
|
|
putchar_unlocked (':'); \
|
|
else \
|
|
printf ("%ld:", sp->n)
|
|
|
|
SHADOW_FIELD (sp_lstchg);
|
|
SHADOW_FIELD (sp_min);
|
|
SHADOW_FIELD (sp_max);
|
|
SHADOW_FIELD (sp_warn);
|
|
SHADOW_FIELD (sp_inact);
|
|
SHADOW_FIELD (sp_expire);
|
|
if (sp->sp_flag == ~0ul)
|
|
putchar_unlocked ('\n');
|
|
else
|
|
printf ("%lu\n", sp->sp_flag);
|
|
}
|
|
|
|
static int
|
|
shadow_keys (int number, char *key[])
|
|
{
|
|
int result = 0;
|
|
int i;
|
|
|
|
if (number == 0)
|
|
{
|
|
struct spwd *sp;
|
|
|
|
setspent ();
|
|
while ((sp = getspent ()) != NULL)
|
|
print_shadow (sp);
|
|
endpwent ();
|
|
return result;
|
|
}
|
|
|
|
for (i = 0; i < number; ++i)
|
|
{
|
|
struct spwd *sp;
|
|
|
|
sp = getspnam (key[i]);
|
|
|
|
if (sp == NULL)
|
|
result = 2;
|
|
else
|
|
print_shadow (sp);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
struct
|
|
{
|
|
const char *name;
|
|
int (*func) (int number, char *key[]);
|
|
} databases[] =
|
|
{
|
|
#define D(name) { #name, name ## _keys },
|
|
D(ahosts)
|
|
D(ahostsv4)
|
|
D(ahostsv6)
|
|
D(aliases)
|
|
D(ethers)
|
|
D(group)
|
|
D(hosts)
|
|
D(netgroup)
|
|
D(networks)
|
|
D(passwd)
|
|
D(protocols)
|
|
D(rpc)
|
|
D(services)
|
|
D(shadow)
|
|
#undef D
|
|
{ NULL, NULL }
|
|
};
|
|
|
|
/* Handle arguments found by argp. */
|
|
static error_t
|
|
parse_option (int key, char *arg, struct argp_state *state)
|
|
{
|
|
char *endp;
|
|
switch (key)
|
|
{
|
|
case 's':
|
|
endp = strchr (arg, ':');
|
|
if (endp == NULL)
|
|
/* No specific database, change them all. */
|
|
for (int i = 0; databases[i].name != NULL; ++i)
|
|
__nss_configure_lookup (databases[i].name, arg);
|
|
else
|
|
{
|
|
int i;
|
|
for (i = 0; databases[i].name != NULL; ++i)
|
|
if (strncmp (databases[i].name, arg, endp - arg) == 0)
|
|
{
|
|
__nss_configure_lookup (databases[i].name, endp + 1);
|
|
break;
|
|
}
|
|
if (databases[i].name == NULL)
|
|
error (EXIT_FAILURE, 0, gettext ("Unknown database name"));
|
|
}
|
|
break;
|
|
|
|
default:
|
|
return ARGP_ERR_UNKNOWN;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static char *
|
|
more_help (int key, const char *text, void *input)
|
|
{
|
|
switch (key)
|
|
{
|
|
size_t len;
|
|
char *doc;
|
|
FILE *fp;
|
|
|
|
case ARGP_KEY_HELP_EXTRA:
|
|
/* We print some extra information. */
|
|
fp = open_memstream (&doc, &len);
|
|
if (fp != NULL)
|
|
{
|
|
fputs_unlocked (_("Supported databases:\n"), fp);
|
|
|
|
for (int i = 0, col = 0; databases[i].name != NULL; ++i)
|
|
{
|
|
len = strlen (databases[i].name);
|
|
if (i != 0)
|
|
{
|
|
if (col + len > 72)
|
|
{
|
|
col = 0;
|
|
fputc_unlocked ('\n', fp);
|
|
}
|
|
else
|
|
fputc_unlocked (' ', fp);
|
|
}
|
|
|
|
fputs_unlocked (databases[i].name, fp);
|
|
col += len + 1;
|
|
}
|
|
|
|
if (fclose (fp) == 0)
|
|
return doc;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
return (char *) text;
|
|
}
|
|
|
|
|
|
/* the main function */
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
/* Debugging support. */
|
|
mtrace ();
|
|
|
|
/* Set locale via LC_ALL. */
|
|
setlocale (LC_ALL, "");
|
|
/* Set the text message domain. */
|
|
textdomain (PACKAGE);
|
|
|
|
/* Parse and process arguments. */
|
|
int remaining;
|
|
argp_parse (&argp, argc, argv, 0, &remaining, NULL);
|
|
|
|
if ((argc - remaining) < 1)
|
|
{
|
|
error (0, 0, gettext ("wrong number of arguments"));
|
|
argp_help (&argp, stdout, ARGP_HELP_SEE, program_invocation_short_name);
|
|
return 1;
|
|
}
|
|
|
|
for (int i = 0; databases[i].name; ++i)
|
|
if (argv[remaining][0] == databases[i].name[0]
|
|
&& !strcmp (argv[remaining], databases[i].name))
|
|
return databases[i].func (argc - remaining - 1, &argv[remaining + 1]);
|
|
|
|
fprintf (stderr, _("Unknown database: %s\n"), argv[remaining]);
|
|
argp_help (&argp, stdout, ARGP_HELP_SEE, program_invocation_short_name);
|
|
return 1;
|
|
}
|