aboutsummaryrefslogtreecommitdiff
path: root/nscd/pwdcache.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-07-18 18:24:30 +0000
committerUlrich Drepper <drepper@redhat.com>2004-07-18 18:24:30 +0000
commit99bb9f426fdd0e27b823708d451b5fa3408ce3e6 (patch)
treead0050aa7d0a7370d131a99b7dc526647efe323c /nscd/pwdcache.c
parent6f53de74bb651fb06b2aa9651f106ff61182bf2f (diff)
downloadglibc-99bb9f426fdd0e27b823708d451b5fa3408ce3e6.tar
glibc-99bb9f426fdd0e27b823708d451b5fa3408ce3e6.tar.gz
glibc-99bb9f426fdd0e27b823708d451b5fa3408ce3e6.tar.bz2
glibc-99bb9f426fdd0e27b823708d451b5fa3408ce3e6.zip
Update.
2004-07-18 Ulrich Drepper <drepper@redhat.com> * nscd/pwdcache.c (cache_addpw): Optimize case of unsuccessful lookup a bit. * nscd/grpcache.c (cache_addgr): Likewise. * nscd/hstcache.c (cache_addhst): Likewise.
Diffstat (limited to 'nscd/pwdcache.c')
-rw-r--r--nscd/pwdcache.c37
1 files changed, 15 insertions, 22 deletions
diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
index f6ca001a87..62501f81d2 100644
--- a/nscd/pwdcache.c
+++ b/nscd/pwdcache.c
@@ -1,5 +1,5 @@
/* Cache handling for passwd lookup.
- Copyright (C) 1998-2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1998-2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -71,13 +71,6 @@ static const pw_response_header notfound =
.pw_shell_len = 0
};
-/* This is the struct describing how to write this record. */
-static const struct iovec iov_notfound =
-{
- .iov_base = (void *) &notfound,
- .iov_len = sizeof (notfound)
-};
-
struct passwddata
{
@@ -98,27 +91,27 @@ cache_addpw (struct database *db, int fd, request_header *req, void *key,
{
/* We have no data. This means we send the standard reply for this
case. */
- void *copy;
-
total = sizeof (notfound);
- written = TEMP_FAILURE_RETRY (writev (fd, &iov_notfound, 1));
+ written = TEMP_FAILURE_RETRY (write (fd, &notfound, total));
- copy = malloc (req->key_len);
- if (copy == NULL)
- error (EXIT_FAILURE, errno, _("while allocating key copy"));
- memcpy (copy, key, req->key_len);
+ void *copy = malloc (req->key_len);
+ /* If we cannot allocate memory simply do not cache the information. */
+ if (copy != NULL)
+ {
+ memcpy (copy, key, req->key_len);
- /* Compute the timeout time. */
- t += db->negtimeout;
+ /* Compute the timeout time. */
+ t += db->negtimeout;
- /* Now get the lock to safely insert the records. */
- pthread_rwlock_rdlock (&db->lock);
+ /* Now get the lock to safely insert the records. */
+ pthread_rwlock_rdlock (&db->lock);
- cache_add (req->type, copy, req->key_len, &notfound,
- sizeof (notfound), (void *) -1, 0, t, db, owner);
+ cache_add (req->type, copy, req->key_len, &notfound,
+ sizeof (notfound), (void *) -1, 0, t, db, owner);
- pthread_rwlock_unlock (&db->lock);
+ pthread_rwlock_unlock (&db->lock);
+ }
}
else
{