From 740152054ecbda66dae0e0f66193d8e244cc2376 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 21 Jan 1998 17:04:36 +0000 Subject: Update. 1998-01-22 00:55 Ulrich Drepper * libc.map: Add __libc_uid, __libc_pid, __syscall_rt_sigqueueinfo, __pread64, __pwrite64, and __getpid. * libc/rt/aio_misc.c: Use pread and pwrite instead of __ protected versions. 1998-01-06 Andreas Schwab * sysdeps/unix/sysv/linux/alpha/syscalls.list: Define the cancelable socket functions as __libc_xxx with __xxx as weak alias. * sysdeps/unix/sysv/linux/mips/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/m68k/socket.S: Allow __socket to be redefined. * sysdeps/unix/sysv/linux/i386/socket.S: Likewise. * sysdeps/unix/sysv/linux/arm/socket.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/socket.S: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/socket.S: Likewise. * sysdeps/unix/sysv/linux/accept.S: Make __libc_xxx the main name and __xxx a weak alias. * sysdeps/unix/sysv/linux/connect.S: Likewise. * sysdeps/unix/sysv/linux/recv.S: Likewise. * sysdeps/unix/sysv/linux/recvfrom.S: Likewise. * sysdeps/unix/sysv/linux/recvmsg.S: Likewise. * sysdeps/unix/sysv/linux/send.S: Likewise. * sysdeps/unix/sysv/linux/sendmsg.S: Likewise. * sysdeps/unix/sysv/linux/sendto.S: Likewise. 1998-01-21 Andreas Jaeger * locale/langinfo.h: Add defines. * dirent/dirent.h: Add defines for DT_*, check also for _DIRENT_HAVE_D_TYPE. Suggested by Roland McGrath. 1998-01-16 Andreas Jaeger * sysdeps/unix/sysv/linux/netinet/ip_fw.h: Update from Linux 2.1.73+79. * README.template: Update information about possible configurations. * manual/mbyte.texi (Wide String Conversion): Fix declaration of wcstombs. Pointed out by Jochen Voss . [PR libc/417]. * manual/time.texi (Priority): Correct description of PRIO_MAX. Pointed out by Jochen Voss . [PR libc/416]. 11998-01-21 21:34 Ulrich Drepper * sysdeps/alpha/fpu/bits/mathdef.h: Add definition of FP_ILOGB0 and FP_ILOGNAN. Patch by a sun . 1998-01-21 17:53 Ulrich Drepper * sysdeps/generic/_strerror.c: Handle BUFLEN == 0. Reported by Andreas Jaeger. 1998-01-20 18:13 Ulrich Drepper * locale/programs/ld-collate.c: Little optimizations. * stdio-common/xbug.c: Unset LD_LIBRRARY_PATH variable. * string/Makefile (tests): Add tst-inlcall. * string/tst-inlcall.c: New file. * string/strsignal.c: Add support for real-time signals. * sysdeps/generic/_strerror.c: Fix Handling of unknown error in presense of small buffer. * sysdeps/i386/bits/string.h: Define _HAVE_STRING_ARCH_* macros. * sysdeps/i386/i486/bits/string.h: Correct strrchr implementation for i686. * sysdeps/unix/sysv/linux/siglist.c: Change length of arrays to _NSIG + 1. 1998-01-02 15:10 Matthias Urlichs * Rules: Add explicit rule for dummy.o; at least one library needs it and it isn't autogenerated by the default rules. 1997-12-31 Andreas Schwab * math/libm-test.c: Tweak epsilons. 1997-12-31 Andreas Schwab * math/test-fenv.c (feenv_nomask_test): Avoid dumping core in the child. (feenv_mask_test): Likewise. 1998-01-01 Andreas Schwab * Makeconfig: Don't export CPPFLAGS. 1998-01-01 Andreas Schwab * sunrpc/rpc_main.c (parseargs): Use perror to print error message. 1998-01-15 Andreas Schwab * nss/nss_db/db-alias.c (_nss_db_getaliasent_r): Don't include terminating null in key size. 1998-01-13 Andreas Schwab * nss/nss_files/files-service.c: Fix allocation size to include length of PROTO. * nss/nss_db/db-XXX.c (lookup): Always set errno and h_errno if applicable. Fix return value and error checking. (CONCAT(_nss_db_get,ENTNAME_r)): Loop around to skip over unparsable lines. (DB_LOOKUP): Allocate space for terminating null byte. * nss/db-Makefile ($(VAR_DB)/passwd.db): Don't handle duplicate uids specially. * db2/makedb.c (process_input): Continue processing if a duplicate key is encountered. 1998-01-19 15:20 Ulrich Drepper * time/tzfile.h: Updated from tzcode1998b. * time/zdump.c: Likewise. * time/zic.c: Likewise. * time/africa: Update from tzdata1998b. * time/antarctica: Likewise. * time/asia: Likewise. * time/australasia: Likewise. * time/etcetera: Likewise. * time/europe: Likewise. * time/leapseconds: Likewise. * time/northamerica: Likewise. * time/southamerica: Likewise. 1998-01-12 Andreas Jaeger * nss/nss_files/files-alias.c (get_next_alias): Do mail alias lookups ignoring case. * nss/nss_files/files-network.c: Do network lookups ignoring case. * nss/nss_files/files-hosts.c: Do hostname lookups ignoring case. * nss/nss_files/files-parse.c (LOOKUP_NAME_CASE): New macro for case insensitive comparing. Patches by Cristian Gafton . 1998-01-09 Andreas Jaeger * sysdeps/unix/sysv/linux/net/if.h: Add IFF_*defines. Suggested by Roland McGrath. [PR libc/395] 1998-01-08 Andreas Jaeger * manual/arith.texi (Parsing of Integers): Correct description of strtoul. Pointed out by Scott Snyder . [PR libc/396] 1997-12-30 14:14 Matthias Urlichs * misc/lsearch.c (lsearch): Return a pointer to the new element if one was "allocated". 1997-12-26 Andreas Schwab * string/strsignal.c: NSIG is not a valid index into _sys_siglist. Don't zap the last character of the "Unknown signal" message. 1998-01-19 15:08 Ulrich Drepper * locale/programs/charmap.c (parse_charmap): Correct parsing of ellipsis expressions. * locale/programs/charset.c (insert_char): Correctly insert value of eliipsis expression. --- nss/db-Makefile | 5 ++- nss/nss_db/db-XXX.c | 71 +++++++++++++++++++++++++++++++++++++------ nss/nss_db/db-alias.c | 6 ++-- nss/nss_files/files-alias.c | 5 +-- nss/nss_files/files-hosts.c | 6 ++-- nss/nss_files/files-network.c | 4 +-- nss/nss_files/files-parse.c | 14 ++++++++- nss/nss_files/files-service.c | 5 +-- 8 files changed, 91 insertions(+), 25 deletions(-) (limited to 'nss') diff --git a/nss/db-Makefile b/nss/db-Makefile index c10267c4df..b3f1ed4ad5 100644 --- a/nss/db-Makefile +++ b/nss/db-Makefile @@ -1,5 +1,5 @@ # Makefile to (re-)generate db versions of system database files. -# Copyright (C) 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Ulrich Drepper , 1996. # @@ -34,8 +34,7 @@ $(VAR_DB)/passwd.db: /etc/passwd @$(AWK) 'BEGIN { FS=":"; OFS=":"; cnt=0 } \ { printf "0%u ", cnt++; print } \ /^[^#]/ { printf ".%s ", $$1; print; \ - if (!uids[$$3]++) \ - { printf "=%s ", $$3; print } }' $^ | \ + printf "=%s ", $$3; print }' $^ | \ $(MAKEDB) -o $@ - @echo "done." diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c index 4d20cae797..1340b77de0 100644 --- a/nss/nss_db/db-XXX.c +++ b/nss/nss_db/db-XXX.c @@ -149,6 +149,7 @@ static enum nss_status lookup (const DBT *key, struct STRUCTURE *result, void *buffer, size_t buflen, int *errnop H_ERRNO_PROTO) { + char *p; enum nss_status status; int err; DBT value; @@ -156,15 +157,59 @@ lookup (const DBT *key, struct STRUCTURE *result, /* Open the database. */ status = internal_setent (keep_db); if (status != NSS_STATUS_SUCCESS) - return status; + { + *errnop = errno; + H_ERRNO_SET (NETDB_INTERNAL); + return status; + } /* Succeed iff it matches a value that parses correctly. */ - err = ((*db->get) (db, key, &value, 0) == 0 && - parse_line (value.data, result, buffer, buflen, errnop)); - if (err == 0) - status = NSS_STATUS_SUCCESS; + err = (*db->get) (db, key, &value, 0); + if (err < 0) + { + *errnop = errno; + H_ERRNO_SET (NETDB_INTERNAL); + status = NSS_STATUS_UNAVAIL; + } + else if (err != 0) + { + H_ERRNO_SET (HOST_NOT_FOUND); + status = NSS_STATUS_NOTFOUND; + } else - status = err < 0 ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND; + { + /* Skip leading blanks. */ + p = (char *) value.data; + while (isspace (*p)) + ++p; + + err = parse_line (p, result, buffer, buflen, errnop); + + if (err == 0) + { + /* If the key begins with '0' we are trying to get the next + entry. We want to ignore unparsable lines in this case. */ + if (((char *) key->data)[0] == '0') + { + /* Super magical return value. We need to tell our caller + that it should continue looping. This value cannot + happen in other cases. */ + status = NSS_STATUS_RETURN; + } + else + { + H_ERRNO_SET (HOST_NOT_FOUND); + status = NSS_STATUS_NOTFOUND; + } + } + else if (err < 0) + { + H_ERRNO_SET (NETDB_INTERNAL); + status = NSS_STATUS_TRYAGAIN; + } + else + status = NSS_STATUS_SUCCESS; + } if (! keep_db) internal_endent (); @@ -196,7 +241,7 @@ _nss_db_get##name##_r (proto, \ { \ DBT key; \ enum nss_status status; \ - const size_t size = (keysize); \ + const size_t size = (keysize) + 1; \ key.data = __alloca (size); \ key.size = KEYPRINTF keypattern; \ __libc_lock_lock (lock); \ @@ -221,8 +266,16 @@ CONCAT(_nss_db_get,ENTNAME_r) (struct STRUCTURE *result, char *buffer, DBT key; __libc_lock_lock (lock); - key.size = 1 + snprintf (key.data = buf, sizeof buf, "0%u", entidx++); - status = lookup (&key, result, buffer, buflen, errnop H_ERRNO_ARG); + + /* Loop until we find a valid entry or hit EOF. See above for the + special meaning of the status value. */ + do + { + key.size = snprintf (key.data = buf, sizeof buf, "0%u", entidx++); + status = lookup (&key, result, buffer, buflen, errnop H_ERRNO_ARG); + } + while (status == NSS_STATUS_RETURN); + __libc_lock_unlock (lock); return status; diff --git a/nss/nss_db/db-alias.c b/nss/nss_db/db-alias.c index 0e72b92ceb..27b7952b30 100644 --- a/nss/nss_db/db-alias.c +++ b/nss/nss_db/db-alias.c @@ -1,5 +1,5 @@ /* Mail alias file parser in nss_db module. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -221,13 +221,13 @@ enum nss_status _nss_db_getaliasent_r (struct aliasent *result, char *buffer, size_t buflen, int *errnop) { - /* Return next entry in host file. */ + /* Return next entry in alias file. */ enum nss_status status; char buf[20]; DBT key; __libc_lock_lock (lock); - key.size = 1 + snprintf (key.data = buf, sizeof buf, "0%u", entidx++); + key.size = snprintf (key.data = buf, sizeof buf, "0%u", entidx++); status = lookup (&key, result, buffer, buflen, errnop); __libc_lock_unlock (lock); diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c index 733e599103..84d771d94e 100644 --- a/nss/nss_files/files-alias.c +++ b/nss/nss_files/files-alias.c @@ -1,5 +1,5 @@ /* Mail alias file parser in nss_files module. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -200,7 +200,8 @@ get_next_alias (const char *match, struct aliasent *result, looking for. If it does not match we simply ignore all lines until the next line containing the start of a new alias is found. */ - ignore = match != NULL && strcmp (result->alias_name, match) != 0; + ignore = (match != NULL + && strcasecmp (result->alias_name, match) != 0); while (! ignore) { diff --git a/nss/nss_files/files-hosts.c b/nss/nss_files/files-hosts.c index d6c4152507..2379919f49 100644 --- a/nss/nss_files/files-hosts.c +++ b/nss/nss_files/files-hosts.c @@ -1,5 +1,5 @@ /* Hosts file parser in nss_files module. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -89,14 +89,14 @@ DB_LOOKUP (hostbyname, ,, if (result->h_addrtype != ((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET)) continue; - LOOKUP_NAME (h_name, h_aliases) + LOOKUP_NAME_CASE (h_name, h_aliases) }, const char *name) DB_LOOKUP (hostbyname2, ,, { if (result->h_addrtype != af) continue; - LOOKUP_NAME (h_name, h_aliases) + LOOKUP_NAME_CASE (h_name, h_aliases) }, const char *name, int af) DB_LOOKUP (hostbyaddr, ,, diff --git a/nss/nss_files/files-network.c b/nss/nss_files/files-network.c index ac5acd5c4e..8180d46e9d 100644 --- a/nss/nss_files/files-network.c +++ b/nss/nss_files/files-network.c @@ -1,5 +1,5 @@ /* Networks file parser in nss_files module. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -44,7 +44,7 @@ LINE_PARSER #include "files-XXX.c" DB_LOOKUP (netbyname, ,, - LOOKUP_NAME (n_name, n_aliases), + LOOKUP_NAME_CASE (n_name, n_aliases), const char *name) DB_LOOKUP (netbyaddr, ,, diff --git a/nss/nss_files/files-parse.c b/nss/nss_files/files-parse.c index 76df1c6ff0..198b359b4c 100644 --- a/nss/nss_files/files-parse.c +++ b/nss/nss_files/files-parse.c @@ -1,5 +1,5 @@ /* Common code for file-based database parsers in nss_files module. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -232,6 +232,18 @@ parse_list (char *line, struct parser_data *data, size_t datalen, int *errnop) break; \ } +#define LOOKUP_NAME_CASE(nameelt, aliaselt) \ +{ \ + char **ap; \ + if (! strcasecmp (name, result->nameelt)) \ + break; \ + for (ap = result->aliaselt; *ap; ++ap) \ + if (! strcasecmp (name, *ap)) \ + break; \ + if (*ap) \ + break; \ +} + /* This is defined by db-*.c to include "../nss_db/db-XXX.c" instead. */ #ifndef GENERIC diff --git a/nss/nss_files/files-service.c b/nss/nss_files/files-service.c index 317b4fa9cc..186b8a27fc 100644 --- a/nss/nss_files/files-service.c +++ b/nss/nss_files/files-service.c @@ -39,7 +39,8 @@ LINE_PARSER #include GENERIC -DB_LOOKUP (servbyname, 1 + strlen (name), (".%s/%s", name, proto), +DB_LOOKUP (servbyname, 2 + strlen (name) + strlen (proto), + (".%s/%s", name, proto), { /* Must match both protocol (if specified) and name. */ if (proto != NULL && strcmp (result->s_proto, proto)) @@ -48,7 +49,7 @@ DB_LOOKUP (servbyname, 1 + strlen (name), (".%s/%s", name, proto), }, const char *name, const char *proto) -DB_LOOKUP (servbyport, 20, ("=%d/%s", port, proto), +DB_LOOKUP (servbyport, 21 + strlen (proto), ("=%d/%s", port, proto), { /* Must match both port and protocol. */ if (result->s_port == port -- cgit 1.4.1