0a55a28475
2000-04-27 Ulrich Drepper <drepper@redhat.com> * hesiod/nss_hesiod/hesiod-grp.c (_nss_hesiod_initgroups): Handle overflows in conversion from ASCII. 2000-04-26 Jakub Jelinek <jakub@redhat.com> * Makeconfig (full_config_sysdirs): Renamed from full-config-sysdirs. * Makerules (full_config_sysdirs): Likewise. * MakeTAGS (full_config_sysdirs): Likewise. 2000-04-26 Jakub Jelinek <jakub@redhat.com> * .cvsignore: Remove linuxthreads. * po/.cvsignore: Remove *.pot. * posix/glob/.cvsignore: Removed. * sysdeps/unix/bsd/osf/.cvsignore: Removed. 2000-04-25 Andreas Jaeger <aj@suse.de> * conform/Makefile (distribute): Also distribute contents of subdirectories. * Makerules (no_deps): Remove abi-versions.h. * nis/nis_print_group_entry.c: Include alloca.h for alloca prototype. 2000-04-25 Jakub Jelinek <jakub@redhat.com> * sysdeps/sparc/sparc64/elf/Dist: Remove. * sysdeps/sparc/sparc64/elf/crtbegin.S: Remove. * sysdeps/sparc/sparc64/elf/crtbeginS.S: Remove. * sysdeps/sparc/sparc64/elf/crtend.S: Remove. * sysdeps/sparc/sparc64/elf/crtendS.S: Remove. * sysdeps/sparc/sparc64/elf/Makefile: Don't build crtbegin/crtend objects. 2000-04-25 Thorsten Kukuk <kukuk@suse.de> * nscd/grpcache.c: Fix gr_name pointer [PR/1702]. 2000-04-23 Bruno Haible <clisp.cons.org> * intl/dcigettext.c: Define _GNU_SOURCE as early as possible. * intl/l10nflist.c: Likewise. 2000-04-23 Bruno Haible <clisp.cons.org> * intl/bindtextdom.c [!_LIBC]: Define __libc_rwlock_define, __libc_rwlock_wrlock, __libc_rwlock_unlock as empty. * intl/textdomain.c [!_LIBC]: Likewise. * intl/dcigettext.c [!_LIBC]: Define __libc_rwlock_define_initialized, __libc_rwlock_rdlock, __libc_rwlock_unlock as empty. * intl/loadmsgcat.c (_nl_load_domain) [!_LIBC, !HAVE_ICONV]: Avoid syntax error. 2000-04-23 Bruno Haible <clisp.cons.org> * intl/dcigettext.c (_nl_find_msg): Do the plural treatment and character set conversion also in the case the translation was found after a hash collision or through binary search. Store the maximum index together with the converted message. Use iconv() when available. In case of out of memory during conversion, return the unconverted translated string, not NULL.
273 lines
7.3 KiB
C
273 lines
7.3 KiB
C
/* Cache handling for group lookup.
|
|
Copyright (C) 1998, 1999, 2000 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 <errno.h>
|
|
#include <error.h>
|
|
#include <grp.h>
|
|
#include <stddef.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <libintl.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, uid_t owner)
|
|
{
|
|
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, ¬found,
|
|
sizeof (notfound), (void *) -1, 0, t, db, owner);
|
|
|
|
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;
|
|
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, owner);
|
|
|
|
cache_add (GETGRBYGID, cp, n, data, total, data, 1, t, db, owner);
|
|
|
|
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, uid_t uid)
|
|
{
|
|
/* 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;
|
|
uid_t oldeuid = 0;
|
|
|
|
if (debug_level > 0)
|
|
dbg_log (_("Haven't found \"%s\" in group cache!"), key);
|
|
|
|
if (secure[grpdb])
|
|
{
|
|
oldeuid = geteuid ();
|
|
seteuid (uid);
|
|
}
|
|
|
|
while (__getgrnam_r (key, &resultbuf, buffer, buflen, &grp) != 0
|
|
&& errno == ERANGE)
|
|
{
|
|
errno = 0;
|
|
buflen += 256;
|
|
buffer = alloca (buflen);
|
|
}
|
|
|
|
if (secure[grpdb])
|
|
seteuid (oldeuid);
|
|
|
|
cache_addgr (db, fd, req, key, grp, uid);
|
|
}
|
|
|
|
|
|
void
|
|
addgrbygid (struct database *db, int fd, request_header *req,
|
|
void *key, uid_t uid)
|
|
{
|
|
/* 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);
|
|
uid_t oldeuid = 0;
|
|
|
|
if (debug_level > 0)
|
|
dbg_log (_("Haven't found \"%d\" in group cache!"), gid);
|
|
|
|
if (secure[grpdb])
|
|
{
|
|
oldeuid = geteuid ();
|
|
seteuid (uid);
|
|
}
|
|
|
|
while (__getgrgid_r (gid, &resultbuf, buffer, buflen, &grp) != 0
|
|
&& errno == ERANGE)
|
|
{
|
|
errno = 0;
|
|
buflen += 256;
|
|
buffer = alloca (buflen);
|
|
}
|
|
|
|
if (secure[grpdb])
|
|
seteuid (oldeuid);
|
|
|
|
cache_addgr (db, fd, req, key, grp, uid);
|
|
}
|