glibc/nscd/nscd_getgr_r.c
Ulrich Drepper e852e88944 Update.
1998-07-28  Ulrich Drepper  <drepper@cygnus.com>

	* math/libm-test.c (tgamma_test): Remove redundant tests.

1998-07-28 16:20  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/generic/glob.c: Correct problems with */foo and GLOB_NOCHECK
	where foo does not exist in any of the subdirectories.
	Reported by Paul D. Smith <psmith@BayNetworks.COM>.

	* posix/globtest.sh: Add test for this bug.

1998-07-28  Mark Kettenis  <kettenis@phys.uva.nl>

	* io/sys/statfs.h: Fix typos.
	* io/sys/statvfs.h: Fix typos.

1998-07-28  Ulrich Drepper  <drepper@cygnus.com>

	* version.h (VERSION): Bump to 2.0.95.

	* math/Makefile (libm-calls): Remove w_gamma, add w_tgamma.
	* math/Versions [GLIBC_2.1]: Add tgamma, tgammaf, and tgammal.
	* math/libm-test.c: Split old gamma_test and move half of it in new
	function tgamma_test.
	* math/bits/mathcalls.h: Add declaration of tgamma.
	* sysdeps/libm-ieee754/k_standard.c: Change gamma errors into
	tgamma errors.
	* sysdeps/libm-ieee754/w_gamma.c: Remove lgamma compatibility code
	and rename to ...
	* sysdeps/libm-ieee754/w_tgamma.c: ... this.  New file.
	* sysdeps/libm-ieee754/w_gammaf.c: Remove lgammaf compatibility code
	and rename to ...
	* sysdeps/libm-ieee754/w_tgammaf.c: ... this.  New file.
	* sysdeps/libm-ieee754/w_gammal.c: Remove lgammal compatibility code
	and rename to ...
	* sysdeps/libm-ieee754/w_tgammal.c: ... this.  New file.
	* sysdeps/libm-ieee754/w_lgamma.c: Add gamma as weak alias.
	* sysdeps/libm-ieee754/w_lgammaf.c: Likewise.
	* sysdeps/libm-ieee754/w_lgammal.c: Likewise.

	* stgdio-common/printf-parse.h: Implement handling of j, t, and z
	modifiers.
	* stdio-common/vfprintf.c: Likewise.
	* stdio-common/vfscanf.c: Likewise.
	* manual/stdio.texi: Document new printf/scanf modifiers.

	* sysdeps/unix/sysv/linux/recvmsg.c: Remove alias __recvmsg.
	* sysdeps/unix/sysv/linux/sendmsg.c: Remove alias __sendmsg.

1998-07-28  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>

	* sunrpc/Makefile (routines): Add clnt_unix and svc_unix.
	* sunrpc/Versions: Add new *unix_create functions.
	* sunrpc/clnt_gen.c: Add support for RPC over AF_UNIX.
	* sunrpc/clnt_unix.c: New, client side of RPC over AF_UNIX.
	* sunrpc/key_call.c: Use RPC over AF_UNIX for communication
	with keyserv daemon.
	* sunrpc/rpc/clnt.h: Add AF_UNIX based RPC function prototypes.
	* sunrpc/rpc/svc.h: Likewise.
	* sunrpc/svc_authux.c: Copy internal auth flavor if none is given.
	* sunrpc/svc_tcp.c: Fix typos.
	* sunrpc/svc_unix.c: New, server side of AF_UNIX based RPC.

	* nis/Makefile: Remove currently not working cache functions.
	* nis/Versions: Add __nisbind_* functions for rpc.nisd.
	* nis/nis_call.c: Rewrite binding to a NIS+ server to reuse
	CLIENT handles.
	* nis/nis_file.c: Fix memory leaks.
	* nis/nis_intern.h: Move internal structs from here ...
	* nis/rpcsvc/nislib.h: ... to here for NIS+ server and tools.
	* nis/nis_lookup.c: Try at first if last client handle works.
	* nis/nis_table.c: Likewise.
	* nis/nis_checkpoint.c: Adjust __do_niscall2 parameters.
	* nis/nis_mkdir.c: Likewise.
	* nis/nis_ping.c: Likewise.
	* nis/nis_rmdir.c: Likewise.
	* nis/nis_server.c: Likewise.
	* nis/nis_util.c: Likewise.
	* nis/nis_findserv.c (__nis_findfastest): Little optimization.

1998-07-28  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* stdlib/strtol.c (STRTOL_LONG_MAX): Correct typo in last patch -
	define as LONG_MAX.

1998-07-28 09:31  Ulrich Drepper  <drepper@cygnus.com>

	* nscd/connections.c (gr_send_answer): Deal with missing UIO_MAXIOV.
	Correct test whether writev send all data.
	* nscd/nscd_getgr_r.c (__nscd_getgr_r): Correct test whether readv
	received all data.

1998-07-28  Mark Kettenis  <kettenis@phys.uva.nl>

	* nscd/nscd_getgr_r.c (__nscd_getgr_r): Deal with missing UIO_MAXIOV.

1998-07-28  Mark Kettenis  <kettenis@phys.uva.nl>

	* sysdeps/mach/hurd/dl-sysdep.c (open_file): Change assert call to
	allow mode to be 0.
	(__xstat): New function.
	(__fxstat): New function.
	(_dl_sysdep_read_whole_file): Removed.  The implementation in
	`elf/dl-misc.c' now also works for the Hurd.
1998-07-28 16:26:04 +00:00

266 lines
6.2 KiB
C

/* Copyright (C) 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@uni-paderborn.de>, 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 <grp.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/socket.h>
#include <sys/uio.h>
#include <sys/un.h>
#include "nscd.h"
#include "nscd_proto.h"
int __nss_not_use_nscd_group;
static int __nscd_getgr_r (const char *key, request_type type,
struct group *resultbuf, char *buffer,
size_t buflen);
int
__nscd_getgrnam_r (const char *name, struct group *resultbuf, char *buffer,
size_t buflen)
{
if (name == NULL)
return 1;
return __nscd_getgr_r (name, GETGRBYNAME, resultbuf, buffer, buflen);
}
int
__nscd_getgrgid_r (gid_t gid, struct group *resultbuf, char *buffer,
size_t buflen)
{
char *p = buffer;
int plen;
plen = __snprintf (buffer, buflen, "%d", gid);
if (plen == -1)
{
__set_errno (ERANGE);
return -1;
}
p = buffer + plen + 1;
return __nscd_getgr_r (buffer, GETGRBYGID, resultbuf, p, buflen - plen -1);
}
/* Create a socket connected to a name. */
static int
nscd_open_socket (void)
{
struct sockaddr_un addr;
int sock;
int saved_errno = errno;
sock = __socket (PF_UNIX, SOCK_STREAM, 0);
if (sock < 0)
{
__set_errno (saved_errno);
return -1;
}
addr.sun_family = AF_UNIX;
strcpy (addr.sun_path, _PATH_NSCDSOCKET);
if (__connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0)
{
__close (sock);
__set_errno (saved_errno);
return -1;
}
return sock;
}
static int
__nscd_getgr_r (const char *key, request_type type, struct group *resultbuf,
char *buffer, size_t buflen)
{
int sock = nscd_open_socket ();
request_header req;
gr_response_header gr_resp;
ssize_t nbytes;
size_t maxiov;
size_t sum;
if (sock == -1)
{
__nss_not_use_nscd_group = 1;
return 1;
}
req.version = NSCD_VERSION;
req.type = type;
req.key_len = strlen (key);
nbytes = __write (sock, &req, sizeof (request_header));
if (nbytes != sizeof (request_header))
{
__close (sock);
return 1;
}
nbytes = __write (sock, key, req.key_len);
if (nbytes != req.key_len)
{
__close (sock);
return 1;
}
nbytes = __read (sock, &gr_resp, sizeof (gr_response_header));
if (nbytes != sizeof (gr_response_header))
{
__close (sock);
return 1;
}
if (gr_resp.found == -1)
{
/* The daemon does not cache this database. */
__close (sock);
__nss_not_use_nscd_group = 1;
return 1;
}
if (gr_resp.found == 1)
{
struct iovec *vec;
size_t *len;
char *p = buffer;
int nblocks;
size_t total_len;
uintptr_t align;
/* A first check whether the buffer is sufficently large is possible. */
if (buflen < gr_resp.gr_name_len + 1 + gr_resp.gr_passwd_len + 1)
{
__set_errno (ERANGE);
__close (sock);
return -1;
}
/* Allocate the IOVEC. */
vec = alloca ((2 + gr_resp.gr_mem_len) * sizeof (struct iovec));
len = alloca (gr_resp.gr_mem_len * sizeof (size_t));
vec[0].iov_base = resultbuf->gr_name = p;
vec[0].iov_len = gr_resp.gr_name_len;
total_len = gr_resp.gr_name_len;
p += gr_resp.gr_name_len + 1;
vec[1].iov_base = resultbuf->gr_passwd = p;
vec[1].iov_len = gr_resp.gr_passwd_len;
total_len += gr_resp.gr_passwd_len;
p += gr_resp.gr_passwd_len + 1;
buflen -= total_len;
nblocks = 2;
if (gr_resp.gr_mem_len > 0)
{
vec[2].iov_base = len;
vec[2].iov_len = gr_resp.gr_mem_len * sizeof (size_t);
total_len += gr_resp.gr_mem_len * sizeof (size_t);
nblocks = 3;
}
/* Get this data. */
if (__readv (sock, vec, nblocks) != total_len)
{
__close (sock);
return 1;
}
/* Now we know the sizes. First terminate the strings we just read. */
resultbuf->gr_name[gr_resp.gr_name_len] = '\0';
resultbuf->gr_passwd[gr_resp.gr_passwd_len] = '\0';
resultbuf->gr_gid = gr_resp.gr_gid;
/* Now allocate the buffer the array for the group members. We must
align the pointer. */
align = ((__alignof__ (char *) - (p - ((char *) 0)))
& (__alignof__ (char *) - 1));
if (align + (1 + gr_resp.gr_mem_len) * sizeof (char *) > buflen)
{
__set_errno (ERANGE);
__close (sock);
return -1;
}
p += align;
resultbuf->gr_mem = (char **) p;
p += (1 + gr_resp.gr_mem_len) * sizeof (char *);
buflen -= align + (1 + gr_resp.gr_mem_len) * sizeof (char *);
resultbuf->gr_mem[gr_resp.gr_mem_len] = NULL;
if (gr_resp.gr_mem_len > 0)
{
/* Prepare reading the group members. */
size_t i;
total_len = 0;
for (i = 0; i < gr_resp.gr_mem_len; ++i)
{
if (len[i] >= buflen)
{
__set_errno (ERANGE);
__close (sock);
return -1;
}
vec[i].iov_base = resultbuf->gr_mem[i] = p;
vec[i].iov_len = len[i];
total_len += len[i];
buflen -= len[i];
p += len[i];
*p++ = '\0';
}
#ifdef UIO_MAXIOV
maxiov = UIO_MAXIOV;
#else
maxiov = sysconf (_SC_UIO_MAXIOV);
#endif
sum = 0;
while (i > maxiov)
{
sum += __readv (sock, vec, maxiov);
vec += maxiov;
i -= maxiov;
}
if (sum + __readv (sock, vec, i) != total_len)
{
__close (sock);
return -1;
}
}
__close (sock);
return 0;
}
else
{
__close (sock);
return -1;
}
}