From 14bab8de31e04b990c2ce83d844f634ec57a6cc6 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 29 Aug 1996 00:31:18 +0000 Subject: update from main archive 960828 Thu Aug 29 00:28:08 1996 Ulrich Drepper * 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 * 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 * 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 * 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 * MakeTAGS ($P/subdirs.pot): Prefix all file names, not only the first one. Fri Aug 16 16:11:25 1996 Thomas Bushnell, n/BSG * 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. --- nss/Makefile | 3 ++- nss/nss_db/db-XXX.c | 22 ++++++++++++---------- nss/nss_files/files-service.c | 10 ++++++---- 3 files changed, 20 insertions(+), 15 deletions(-) (limited to 'nss') diff --git a/nss/Makefile b/nss/Makefile index 5dcae4d40e..4a36dcf580 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -23,7 +23,8 @@ subdir := nss headers := nss.h distribute := nsswitch.h XXX-lookup.c getXXbyYY.c getXXbyYY_r.c \ - getXXent.c getXXent_r.c databases.def + getXXent.c getXXent_r.c databases.def \ + nsswitch.conf db-Makefile # This is the trivial part which goes into libc itself. routines = nsswitch $(addsuffix -lookup,$(databases)) diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c index 792dc5cea9..e2bab51f5d 100644 --- a/nss/nss_db/db-XXX.c +++ b/nss/nss_db/db-XXX.c @@ -34,7 +34,7 @@ Cambridge, MA 02139, USA. */ #define ENTNAME_r CONCAT(ENTNAME,_r) #include -#define DBFILE _PATH_VARDB DATABASE +#define DBFILE _PATH_VARDB DATABASE ".db" #ifdef NEED_H_ERRNO #define H_ERRNO_PROTO , int *herrnop @@ -79,7 +79,7 @@ internal_setent (int stayopen) /* Thread-safe, exported version of that. */ int -CONCAT(_nss_files_set,ENTNAME) (int stayopen) +CONCAT(_nss_db_set,ENTNAME) (int stayopen) { int status; @@ -110,7 +110,7 @@ internal_endent (void) /* Thread-safe, exported version of that. */ int -CONCAT(_nss_files_end,ENTNAME) (void) +CONCAT(_nss_db_end,ENTNAME) (void) { __libc_lock_lock (lock); @@ -133,11 +133,13 @@ lookup (const DBT *key, struct STRUCTURE *result, DBT value; /* Open the database. */ - internal_setent (keep_db); + status = internal_setent (keep_db); + if (status != NSS_STATUS_SUCCESS) + return status; /* Succeed iff it matches a value that parses correctly. */ status = (((*db->get) (db, key, &value, 0) == 0 && - parse_line (value.data, result, buffer, buflen) == 0) + parse_line (value.data, result, buffer, buflen)) ? NSS_STATUS_SUCCESS : NSS_STATUS_NOTFOUND); if (! keep_db) @@ -164,9 +166,9 @@ lookup (const DBT *key, struct STRUCTURE *result, #define DB_LOOKUP(name, keysize, keypattern, break_if_match, proto...) \ enum nss_status \ -_nss_files_get##name##_r (proto, \ - struct STRUCTURE *result, \ - char *buffer, int buflen H_ERRNO_PROTO) \ +_nss_db_get##name##_r (proto, \ + struct STRUCTURE *result, \ + char *buffer, int buflen H_ERRNO_PROTO) \ { \ DBT key; \ enum nss_status status; \ @@ -186,8 +188,8 @@ _nss_files_get##name##_r (proto, \ /* Return the next entry from the database file, doing locking. */ enum nss_status -CONCAT(_nss_files_get,ENTNAME_r) (struct STRUCTURE *result, - char *buffer, int buflen H_ERRNO_PROTO) +CONCAT(_nss_db_get,ENTNAME_r) (struct STRUCTURE *result, + char *buffer, int buflen H_ERRNO_PROTO) { /* Return next entry in host file. */ enum nss_status status; diff --git a/nss/nss_files/files-service.c b/nss/nss_files/files-service.c index 1bd26d1f07..128ae37f46 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) -- cgit v1.2.3