diff options
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/getXXbyYY_r.c | 2 | ||||
| -rw-r--r-- | nss/getXXent.c | 2 | ||||
| -rw-r--r-- | nss/nss_files/files-XXX.c | 3 | ||||
| -rw-r--r-- | nss/nss_files/files-hosts.c | 1 | ||||
| -rw-r--r-- | nss/nss_files/files-parse.c | 26 | ||||
| -rw-r--r-- | nss/nss_files/files-service.c | 9 |
6 files changed, 32 insertions, 11 deletions
diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c index 11c4e9f71f..37ad22d045 100644 --- a/nss/getXXbyYY_r.c +++ b/nss/getXXbyYY_r.c @@ -106,7 +106,7 @@ REENTRANT_NAME (ADD_PARAMS, LOOKUP_TYPE *result, char *buffer, int buflen initialize it. */ if ((_res.options & RES_INIT) == 0 && res_init () == -1) { - h_errno = NETDB_INTERNAL; + *h_errnop = NETDB_INTERNAL; return NULL; } #endif /* need _res */ diff --git a/nss/getXXent.c b/nss/getXXent.c index da3712c70f..fd75979c9d 100644 --- a/nss/getXXent.c +++ b/nss/getXXent.c @@ -57,7 +57,7 @@ LOOKUP_TYPE * GETFUNC_NAME (void) { static char buffer[BUFLEN]; - LOOKUP_TYPE result; + static LOOKUP_TYPE result; return REENTRANT_GETNAME (&result, buffer, BUFLEN H_ERRNO_VAR); } diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c index 7fa87c098a..80efd294a9 100644 --- a/nss/nss_files/files-XXX.c +++ b/nss/nss_files/files-XXX.c @@ -30,7 +30,8 @@ Cambridge, MA 02139, USA. */ DATABASE -- string of the database file's name ("hosts", "passwd"). NEED_H_ERRNO - defined iff an arg `int *herrnop' is used. - MIDLINE_COMMENTS - defined iff # before \n terminates a database line. + + Also see files-parse.c. */ #define ENTNAME_r CONCAT(ENTNAME,_r) diff --git a/nss/nss_files/files-hosts.c b/nss/nss_files/files-hosts.c index bc9eaa39a5..e3d83fec26 100644 --- a/nss/nss_files/files-hosts.c +++ b/nss/nss_files/files-hosts.c @@ -31,6 +31,7 @@ Cambridge, MA 02139, USA. */ #define ENTNAME hostent #define DATABASE "hosts" +#define NEED_H_ERRNO #define ENTDATA hostent_data struct hostent_data diff --git a/nss/nss_files/files-parse.c b/nss/nss_files/files-parse.c index 1f3b13886d..c9fb1f81e9 100644 --- a/nss/nss_files/files-parse.c +++ b/nss/nss_files/files-parse.c @@ -22,6 +22,18 @@ Cambridge, MA 02139, USA. */ #include <string.h> #include <stdlib.h> +/* These symbols are defined by the including source file: + + ENTNAME -- database name of the structure and functions (hostent, pwent). + STRUCTURE -- struct name, define only if not ENTNAME (passwd, group). + DATABASE -- string of the database file's name ("hosts", "passwd"). + + ENTDATA -- if defined, `struct ENTDATA' is used by the parser to store + things pointed to by the resultant `struct STRUCTURE'. + + NEED_H_ERRNO - defined iff an arg `int *herrnop' is used. + + Also see files-XXX.c. */ #define CONCAT(a,b) CONCAT1(a,b) #define CONCAT1(a,b) a##b @@ -83,13 +95,15 @@ parse_line (char *line, struct STRUCTURE *result, \ #define STRING_FIELD(variable, terminator_p, swallow) \ { \ variable = line; \ - while (!terminator_p (*line)) \ - if (*++line == '\0') \ - return 0; \ - *line = '\0'; \ - do \ + while (*line != '\0' && !terminator_p (*line)) \ ++line; \ - while (swallow && terminator_p (*line)); \ + if (*line != '\0') \ + { \ + *line = '\0'; \ + do \ + ++line; \ + while (swallow && terminator_p (*line)); \ + } \ } #define INT_FIELD(variable, terminator_p, swallow, base, convert) \ 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), { |