diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1996-08-29 00:31:18 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1996-08-29 00:31:18 +0000 |
| commit | 14bab8de31e04b990c2ce83d844f634ec57a6cc6 (patch) | |
| tree | f6a25bd165f8997c08e58f6f2de69e9d34e0fda0 /nss/nss_files | |
| parent | b236e99d90748f6caf77994e96dc5aaa48ce2993 (diff) | |
| download | glibc-14bab8de31e04b990c2ce83d844f634ec57a6cc6.zip glibc-14bab8de31e04b990c2ce83d844f634ec57a6cc6.tar.gz glibc-14bab8de31e04b990c2ce83d844f634ec57a6cc6.tar.bz2 | |
update from main archive 960828glibc-1.93cvs/libc-960829cvs/libc-1-93
Thu Aug 29 00:28:08 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/printf_fp.c (__printf_fp): Use default value `.` if
`decimal' char is 0.
* C-numeric.c (not_available): New constant.
(_nl_C_LC_NUMERIC): Use `not_available' for grouping value.
* nss/nsswitch.conf: Example configuration file.
* nss/db-Makefile: Example Makefile for generation of databases
for nss_db.
* nss/Makefile (distribute): Add nsswitch.conf and db-Makefile.
1996-08-28 Paul Eggert <eggert@twinsun.com>
* C-messages.c (_nl_C_LC_MESSAGES): Set yesexpr to "^[yY]" and
noexpr to "^[nN]"; this conforms to POSIX.2.
* C-time.c (_nl_C_LC_TIME): Change %d to %e in d_t_format, to
conform to POSIX.2.
1996-08-28 Paul Eggert <eggert@twinsun.com>
* C-monetary.c (not_available): New constant.
(_nl_C_LC_MONETARY): Set mon_decimal_point to "", and set
mon_grouping, int_frac_digits, frac_digits, p_cs_precedes,
p_sep_by_space, n_cs_precedes, n_sep_by_space, p_sign_posn, and
n_sign_posn to CHAR_MAX, as required by the POSIX Standard.
Wed Aug 28 23:12:28 1996 Ulrich Drepper <drepper@cygnus.com>
* nss/nss_db/db-XXX.c: Correct function names. They must be
`_nss_db_*' instead of `_nss_files_*'.
(lookup): `parse_line' returns 1 if succesful.
* nss/nss_files/files-service.c (servbyname): Key for database
must also contain protocol names.
(servbypt): Likewise.
Test must also check for protocol. Add `proto' argument.
Tue Aug 27 09:56:13 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* MakeTAGS ($P/subdirs.pot): Prefix all file names, not only the
first one.
Fri Aug 16 16:11:25 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* nss/nss_dns/dns-host.c (_nss_dns_gethostbyname2_r): Treat
EPFNOSUPPORT and EAFNOSUPPORT as implying NSS_STATUS_UNAVAIL just
like ECONNREFUSED already does.
(_nss_dns_gethostbyaddr_r): Likewise.
* nss/nss_dns/dns-network.c (_nss_dns_getnetbyname_r): Likewise.
(_nss_dns_getnetbyaddr_r): Likewise.
* sysdeps/mach/hurd/socket.c (socket): For message transmission
and RPC errors that indicate that the socket server is not really
present and able to do its job, turn the error into EPFNOSUPPORT.
* sysdeps/generic/sbrk.c (__sbrk): Get kernel brk address
always only if in static libc or if statically linked program
uses libc.so.
Diffstat (limited to 'nss/nss_files')
| -rw-r--r-- | nss/nss_files/files-service.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nss/nss_files/files-service.c b/nss/nss_files/files-service.c index 1bd26d1..128ae37 100644 --- a/nss/nss_files/files-service.c +++ b/nss/nss_files/files-service.c @@ -39,7 +39,7 @@ LINE_PARSER #include GENERIC -DB_LOOKUP (servbyname, 1 + strlen (name), (".%s", name), +DB_LOOKUP (servbyname, 1 + strlen (name), (".%s/%s", name, proto), { /* Must match both protocol and name. */ if (strcmp (result->s_proto, proto)) @@ -48,8 +48,10 @@ DB_LOOKUP (servbyname, 1 + strlen (name), (".%s", name), }, const char *name, const char *proto) -DB_LOOKUP (servbyport, 20, ("=%d", port), +DB_LOOKUP (servbyport, 20, ("=%d/%s", port, proto), { - if (result->s_port == port) + /* Must match both port and protocol. */ + if (result->s_port == port + && strcmp (result->s_proto, proto) == 0) break; - }, int port) + }, int port, const char *proto) |