diff options
Diffstat (limited to 'nss/nss_db')
| -rw-r--r-- | nss/nss_db/db-XXX.c | 71 | ||||
| -rw-r--r-- | nss/nss_db/db-alias.c | 6 |
2 files changed, 65 insertions, 12 deletions
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 <drepper@cygnus.com>, 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); |