diff options
| author | Roland McGrath <roland@gnu.org> | 1996-07-12 00:20:03 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-07-12 00:20:03 +0000 |
| commit | adc6ff7f817959b0acf48de1bf0e7a7a6c0b901d (patch) | |
| tree | a7dcc8f043035c6cbfafce6668d36f03829d83ef /nss/nss_files/files-service.c | |
| parent | ddc6fb0c8eb078061490718b78af41d0d77bc568 (diff) | |
| download | glibc-adc6ff7f817959b0acf48de1bf0e7a7a6c0b901d.tar.gz glibc-adc6ff7f817959b0acf48de1bf0e7a7a6c0b901d.tar.xz glibc-adc6ff7f817959b0acf48de1bf0e7a7a6c0b901d.zip | |
Thu Jul 11 20:09:55 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* nss/nss_files/files-service.c (getservbyname): Take second arg PROTO
and check it.
* nss/nss_files/files-XXX.c: Comment fix.
Fri Jul 12 01:28:35 1996 Ulrich Drepper <drepper@cygnus.com>
* nss/getXXent_r.c (GETFUNC_NAME_STRING): Define with name
of reentrant function.
(setup): Pass additional argument with function name we are
looking for.
(SETFUNC_NAME, ENDFUNC_NAME, GETFUNC_NAME): Call setup with
new argument {SET,END,GET}FUNC_NAME_STRING.
* nss/getXXent.c (GETFUNC_NAME): RESULT must be static because
we return a pointer.
Thu Jul 11 18:20:44 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* nss/nss_files/files-parse.c: Add comment about things to #define.
* nss/nss_files/files-hosts.c (NEED_H_ERRNO): Define it.
* nss/nss_files/files-parse.c (STRING_FIELD): Don't flag NUL before
terminator char as an error.
* nss/getXXbyYY_r.c (REENTRANT_NAME): Set *H_ERRNOP, not h_errno.
Thu Jul 11 03:21:10 1996 Ulrich Drepper <drepper@cygnus.com>
* catgets/gencat.c (write_out): Move code to determine new
best size out of inner loop.
Wed Jul 10 05:24:40 1996 David Mosberger-Tang <davidm@azstarnet.com>
* misc/mntent.c: Include <sys/types.h>.
(endmntent): Return 1 one success, 0 on failure.
(getmntent): Chop newline and ignore empty lines.
Mon Jul 8 21:18:40 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/m68k/dl-machine.h (RESOLVE): New macro, defined
differently based on [RTLD_BOOTSTRAP].
(elf_machine_rela): Use it instead of the fn ptr arg directly.
Diffstat (limited to 'nss/nss_files/files-service.c')
| -rw-r--r-- | nss/nss_files/files-service.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nss/nss_files/files-service.c b/nss/nss_files/files-service.c index 5dea476208..1bd26d1f07 100644 --- a/nss/nss_files/files-service.c +++ b/nss/nss_files/files-service.c @@ -40,8 +40,13 @@ LINE_PARSER #include GENERIC DB_LOOKUP (servbyname, 1 + strlen (name), (".%s", name), - LOOKUP_NAME (s_name, s_aliases), - const char *name) + { + /* Must match both protocol and name. */ + if (strcmp (result->s_proto, proto)) + continue; + LOOKUP_NAME (s_name, s_aliases) + }, + const char *name, const char *proto) DB_LOOKUP (servbyport, 20, ("=%d", port), { |