67479a700e
1998-10-18 Ulrich Drepper <drepper@cygnus.com> * resolv/nss_dns/dns-host.c: Add missing errnop parameter to the NSS functions. * resolv/nss_dns/dns-network.c: Likewise. * grp/Makefile: Don't search for linuxhtreads in add-ons, use have-thread-library to determine whether threads are available. * pwd/Makefile: Remove wrong comment. * inet/Makefile: Define CFLAGS-gethstbyad_r.c, CFLAGS-gethstbynm_r.c, and CFLAGS-gethstbynm2_r.c to -DUSE_NSCD=1. * locale/C-messages.c: Define default strings for YESTR and NOSTR. * nss/Versions: Add __nss_hosts_lookup. * nss/getXXbyYY.c: Remove unneeded assignment. * nss/getXXbyYY_r.c: Include nscd/nscd_proto.h only if needed. Almost complete rewrite of the NSCD to make it smaller, faster, add more functionnality and make it easier to extend. * nscd/Makfile (routines): Add nscd_gethst_r. (nscd-modules): Add hstcache, gethstbyad_r, gethstbynm2_r, and cache. * nscd/cache.c: New file. * nscd/gethstbyad_r.c: New file. * nscd/gethstbynm2_r.c: New file. * nscd/hstcache.c: New file. * nscd/nscd_gethst_r.c: New file. * nscd/connections.c: Rewritten. Don't start new thread for every new connection. Use a fixed set of threads which handle all connections and also the cache cleanup. * nscd/grpcache.c: Rewritten to use generic cache handling functions in cache.c. * nscd/nscd.c: Recognize new parameter nthreads. Adjust initialization for rewrite. Remove handle_requests function. * nscd/nscd.h (NSCD_VERSION): Bump to 2. Define new data structure for the new unified cache and the host database entries. * nscd/nscd_conf.c: Rewrite parsing partly to allow adding of more databases easily. Recognize check-files and threads definitions. * nscd/nscd.conf: Add definition of enable-cache and check-files to passwd and group definitions. Add new set of definitions for hosts. * nscd/nscd_getgr_r.c: Rewrite for new protocol. * nscd/nscd_getpw_r.c: Likewise. * nscd/nscd_proto.h: Add prototype for host database functions. * nscd/nscd_stat.c: Rewrite to simplify printing of information for many databases. * nscd/dbg_log.c: Remove unnecessary variable initializations. Global variable debug_flag is renamed to dbg_level. * nscd/dbg_log.h: Declare set_logfile.
250 lines
6.9 KiB
C
250 lines
6.9 KiB
C
/* Cache handling for group lookup.
|
|
Copyright (C) 1998 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <error.h>
|
|
#include <grp.h>
|
|
#include <stddef.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include "nscd.h"
|
|
#include "dbg_log.h"
|
|
|
|
/* This is the standard reply in case the service is disabled. */
|
|
static const gr_response_header disabled =
|
|
{
|
|
version: NSCD_VERSION,
|
|
found: -1,
|
|
gr_name_len: 0,
|
|
gr_passwd_len: 0,
|
|
gr_gid: -1,
|
|
gr_mem_cnt: 0,
|
|
};
|
|
|
|
/* This is the struct describing how to write this record. */
|
|
const struct iovec grp_iov_disabled =
|
|
{
|
|
iov_base: (void *) &disabled,
|
|
iov_len: sizeof (disabled)
|
|
};
|
|
|
|
|
|
/* This is the standard reply in case we haven't found the dataset. */
|
|
static const gr_response_header notfound =
|
|
{
|
|
version: NSCD_VERSION,
|
|
found: 0,
|
|
gr_name_len: 0,
|
|
gr_passwd_len: 0,
|
|
gr_gid: -1,
|
|
gr_mem_cnt: 0,
|
|
};
|
|
|
|
/* This is the struct describing how to write this record. */
|
|
static const struct iovec iov_notfound =
|
|
{
|
|
iov_base: (void *) ¬found,
|
|
iov_len: sizeof (notfound)
|
|
};
|
|
|
|
|
|
struct groupdata
|
|
{
|
|
gr_response_header resp;
|
|
char strdata[0];
|
|
};
|
|
|
|
|
|
static void
|
|
cache_addgr (struct database *db, int fd, request_header *req, void *key,
|
|
struct group *grp)
|
|
{
|
|
ssize_t total;
|
|
ssize_t written;
|
|
time_t t = time (NULL);
|
|
|
|
if (grp == NULL)
|
|
{
|
|
/* We have no data. This means we send the standard reply for this
|
|
case. */
|
|
void *copy;
|
|
|
|
total = sizeof (notfound);
|
|
|
|
written = writev (fd, &iov_notfound, 1);
|
|
|
|
copy = malloc (req->key_len);
|
|
if (copy == NULL)
|
|
error (EXIT_FAILURE, errno, _("while allocating key copy"));
|
|
memcpy (copy, key, req->key_len);
|
|
|
|
/* Compute the timeout time. */
|
|
t += db->negtimeout;
|
|
|
|
/* Now get the lock to safely insert the records. */
|
|
pthread_rwlock_rdlock (&db->lock);
|
|
|
|
cache_add (req->type, copy, req->key_len, &iov_notfound,
|
|
sizeof (notfound), (void *) -1, 0, t, db);
|
|
|
|
pthread_rwlock_unlock (&db->lock);
|
|
}
|
|
else
|
|
{
|
|
/* Determine the I/O structure. */
|
|
struct groupdata *data;
|
|
size_t gr_name_len = strlen (grp->gr_name) + 1;
|
|
size_t gr_passwd_len = strlen (grp->gr_passwd) + 1;
|
|
size_t gr_mem_cnt = 0;
|
|
size_t *gr_mem_len;
|
|
size_t gr_mem_len_total = 0;
|
|
char *gr_name;
|
|
char *cp;
|
|
char buf[12];
|
|
ssize_t n;
|
|
size_t cnt;
|
|
|
|
/* We need this to insert the `bygid' entry. */
|
|
n = snprintf (buf, sizeof (buf), "%d", grp->gr_gid) + 1;
|
|
|
|
/* Determine the length of all members. */
|
|
while (grp->gr_mem[gr_mem_cnt])
|
|
++gr_mem_cnt;
|
|
gr_mem_len = (size_t *) alloca (gr_mem_cnt * sizeof (size_t));
|
|
for (gr_mem_cnt = 0; grp->gr_mem[gr_mem_cnt]; ++gr_mem_cnt)
|
|
{
|
|
gr_mem_len[gr_mem_cnt] = strlen (grp->gr_mem[gr_mem_cnt]) + 1;
|
|
gr_mem_len_total += gr_mem_len[gr_mem_cnt];
|
|
}
|
|
|
|
/* We allocate all data in one memory block: the iov vector,
|
|
the response header and the dataset itself. */
|
|
total = (sizeof (struct groupdata)
|
|
+ gr_mem_cnt * sizeof (size_t)
|
|
+ gr_name_len + gr_passwd_len + gr_mem_len_total);
|
|
data = (struct groupdata *) malloc (total + n);
|
|
if (data == NULL)
|
|
/* There is no reason to go on. */
|
|
error (EXIT_FAILURE, errno, _("while allocating cache entry"));
|
|
|
|
data->resp.found = 1;
|
|
data->resp.gr_name_len = gr_name_len;
|
|
data->resp.gr_passwd_len = gr_passwd_len;
|
|
data->resp.gr_gid = grp->gr_gid;
|
|
data->resp.gr_mem_cnt = gr_mem_cnt;
|
|
|
|
cp = data->strdata;
|
|
|
|
/* This is the member string length array. */
|
|
cp = mempcpy (cp, gr_mem_len, gr_mem_cnt * sizeof (size_t));
|
|
gr_name = cp = mempcpy (cp, grp->gr_name, gr_name_len);
|
|
cp = mempcpy (cp, grp->gr_passwd, gr_passwd_len);
|
|
|
|
for (cnt = 0; cnt < gr_mem_cnt; ++cnt)
|
|
cp = mempcpy (cp, grp->gr_mem[cnt], gr_mem_len[cnt]);
|
|
|
|
/* Finally the stringified GID value. */
|
|
memcpy (cp, buf, n);
|
|
|
|
/* Write the result. */
|
|
written = write (fd, &data->resp, total);
|
|
|
|
/* Compute the timeout time. */
|
|
t += db->postimeout;
|
|
|
|
/* Now get the lock to safely insert the records. */
|
|
pthread_rwlock_rdlock (&db->lock);
|
|
|
|
/* We have to add the value for both, byname and byuid. */
|
|
cache_add (GETGRBYNAME, gr_name, gr_name_len, data,
|
|
total, data, 0, t, db);
|
|
|
|
cache_add (GETGRBYGID, cp, n, data, total, data, 1, t, db);
|
|
|
|
pthread_rwlock_unlock (&db->lock);
|
|
}
|
|
|
|
if (written != total)
|
|
{
|
|
char buf[256];
|
|
dbg_log (_("short write in %s: %s"), __FUNCTION__,
|
|
strerror_r (errno, buf, sizeof (buf)));
|
|
}
|
|
}
|
|
|
|
|
|
void
|
|
addgrbyname (struct database *db, int fd, request_header *req, void *key)
|
|
{
|
|
/* Search for the entry matching the key. Please note that we don't
|
|
look again in the table whether the dataset is now available. We
|
|
simply insert it. It does not matter if it is in there twice. The
|
|
pruning function only will look at the timestamp. */
|
|
int buflen = 256;
|
|
char *buffer = alloca (buflen);
|
|
struct group resultbuf;
|
|
struct group *grp;
|
|
|
|
if (debug_level > 0)
|
|
dbg_log (_("Haven't found \"%s\" in group cache!"), key);
|
|
|
|
while (getgrnam_r (key, &resultbuf, buffer, buflen, &grp) != 0
|
|
&& errno == ERANGE)
|
|
{
|
|
errno = 0;
|
|
buflen += 256;
|
|
buffer = alloca (buflen);
|
|
}
|
|
|
|
cache_addgr (db, fd, req, key, grp);
|
|
}
|
|
|
|
|
|
void
|
|
addgrbygid (struct database *db, int fd, request_header *req, void *key)
|
|
{
|
|
/* Search for the entry matching the key. Please note that we don't
|
|
look again in the table whether the dataset is now available. We
|
|
simply insert it. It does not matter if it is in there twice. The
|
|
pruning function only will look at the timestamp. */
|
|
int buflen = 256;
|
|
char *buffer = alloca (buflen);
|
|
struct group resultbuf;
|
|
struct group *grp;
|
|
gid_t gid = atol (key);
|
|
|
|
if (debug_level > 0)
|
|
dbg_log (_("Haven't found \"%d\" in group cache!"), gid);
|
|
|
|
while (getgrgid_r (gid, &resultbuf, buffer, buflen, &grp) != 0
|
|
&& errno == ERANGE)
|
|
{
|
|
errno = 0;
|
|
buflen += 256;
|
|
buffer = alloca (buflen);
|
|
}
|
|
|
|
cache_addgr (db, fd, req, key, grp);
|
|
}
|