-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@uni-paderborn.de>, 1998.
#include <errno.h>
#include <grp.h>
+#include <stdint.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-client.h"
#include "nscd_proto.h"
-static int __nscd_getgr_r (const char *key, request_type type,
- struct group *resultbuf, char *buffer,
- size_t buflen);
+int __nss_not_use_nscd_group;
+
+static int nscd_getgr_r (const char *key, size_t keylen, request_type type,
+ struct group *resultbuf, char *buffer,
+ size_t buflen) internal_function;
+
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);
+ return nscd_getgr_r (name, strlen (name) + 1, GETGRBYNAME, resultbuf,
+ buffer, buflen);
}
+
int
__nscd_getgrgid_r (gid_t gid, struct group *resultbuf, char *buffer,
size_t buflen)
{
- char *p = buffer;
- char plen;
+ char buf[12];
+ size_t n;
- plen = snprintf (buffer, buflen, "%d", gid);
- if (plen == -1)
- {
- __set_errno (ERANGE);
- return -1;
- }
- p = buffer + plen + 1;
+ n = __snprintf (buf, sizeof (buf), "%d", gid) + 1;
- return __nscd_getgr_r (buffer, GETGRBYGID, resultbuf, p, buflen - plen -1);
+ return nscd_getgr_r (buf, n, GETGRBYGID, resultbuf, buffer, buflen);
}
+
/* Create a socket connected to a name. */
static int
-nscd_open_socket (void)
+open_socket (void)
{
struct sockaddr_un addr;
int sock;
int saved_errno = errno;
- sock = socket (PF_UNIX, SOCK_STREAM, 0);
+ sock = __socket (PF_UNIX, SOCK_STREAM, 0);
if (sock < 0)
{
__set_errno (saved_errno);
addr.sun_family = AF_UNIX;
strcpy (addr.sun_path, _PATH_NSCDSOCKET);
- if (connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0)
+ if (__connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0)
{
- close (sock);
+ __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)
+internal_function
+nscd_getgr_r (const char *key, size_t keylen, request_type type,
+ struct group *resultbuf, char *buffer, size_t buflen)
{
- int sock = nscd_open_socket ();
+ int sock = open_socket ();
request_header req;
gr_response_header gr_resp;
ssize_t nbytes;
+ struct iovec vec[2];
if (sock == -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);
+ __nss_not_use_nscd_group = 1;
return 1;
}
- nbytes = write (sock, key, req.key_len);
- if (nbytes != req.key_len)
+ req.version = NSCD_VERSION;
+ req.type = type;
+ req.key_len = keylen;
+
+ vec[0].iov_base = &req;
+ vec[0].iov_len = sizeof (request_header);
+ vec[1].iov_base = (void *) key;
+ vec[1].iov_len = keylen;
+
+ if (__writev (sock, vec, 2) != sizeof (request_header) + keylen)
{
- close (sock);
+ __close (sock);
return 1;
}
- nbytes = read (sock, &gr_resp, sizeof (gr_response_header));
+ nbytes = __read (sock, &gr_resp, sizeof (gr_response_header));
if (nbytes != sizeof (gr_response_header))
{
- close (sock);
+ __close (sock);
return 1;
}
if (gr_resp.found == -1)
{
- close (sock);
+ /* The daemon does not cache this database. */
+ __close (sock);
+ __nss_not_use_nscd_group = 1;
return 1;
}
if (gr_resp.found == 1)
{
- size_t i;
+ size_t *len;
char *p = buffer;
-
- if (buflen < gr_resp.gr_name_len + 1)
+ size_t total_len;
+ uintptr_t align;
+ size_t cnt;
+
+ /* 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 (buflen < (align + (1 + gr_resp.gr_mem_cnt) * sizeof (char *)
+ + gr_resp.gr_name_len + gr_resp.gr_passwd_len))
{
+ no_room:
__set_errno (ERANGE);
- close (sock);
+ __close (sock);
return -1;
}
- resultbuf->gr_name = p;
- p += gr_resp.gr_name_len + 1;
- buflen -= (gr_resp.gr_name_len + 1);
- nbytes = read (sock, resultbuf->gr_name, gr_resp.gr_name_len);
- if (nbytes != gr_resp.gr_name_len)
- {
- close (sock);
- return 1;
- }
- resultbuf->gr_name[gr_resp.gr_name_len] = '\0';
- if (buflen < gr_resp.gr_passwd_len + 1)
- {
- __set_errno (ERANGE);
- close (sock);
- return -1;
- }
+ p += align;
+ resultbuf->gr_mem = (char **) p;
+ p += (1 + gr_resp.gr_mem_cnt) * sizeof (char *);
+ buflen -= align + (1 + gr_resp.gr_mem_cnt) * sizeof (char *);
+
+ /* Set pointers for strings. */
+ resultbuf->gr_name = p;
+ p += gr_resp.gr_name_len;
resultbuf->gr_passwd = p;
- p += gr_resp.gr_passwd_len + 1;
- buflen -= (gr_resp.gr_passwd_len + 1);
- nbytes = read (sock, resultbuf->gr_passwd, gr_resp.gr_passwd_len);
- if (nbytes != gr_resp.gr_passwd_len)
+ p += gr_resp.gr_passwd_len;
+
+ /* Fill in what we know now. */
+ resultbuf->gr_gid = gr_resp.gr_gid;
+
+ /* Allocate array to store lengths. */
+ len = alloca (gr_resp.gr_mem_cnt * sizeof (size_t));
+
+ total_len = gr_resp.gr_mem_cnt * sizeof (size_t);
+ vec[0].iov_base = len;
+ vec[0].iov_len = total_len;
+ vec[1].iov_base = resultbuf->gr_name;
+ vec[1].iov_len = gr_resp.gr_name_len + gr_resp.gr_passwd_len;
+ total_len += gr_resp.gr_name_len + gr_resp.gr_passwd_len;
+
+ buflen -= total_len;
+
+ /* Get this data. */
+ if (__readv (sock, vec, 2) != total_len)
{
- close (sock);
+ __close (sock);
return 1;
}
- resultbuf->gr_passwd[gr_resp.gr_passwd_len] = '\0';
- resultbuf->gr_gid = gr_resp.gr_gid;
+ /* Clear the terminating entry. */
+ resultbuf->gr_mem[gr_resp.gr_mem_cnt] = NULL;
- if (buflen < ((gr_resp.gr_mem_len + 1) * sizeof (char *)))
+ /* Prepare reading the group members. */
+ total_len = 0;
+ for (cnt = 0; cnt < gr_resp.gr_mem_cnt; ++cnt)
{
- __set_errno (ERANGE);
- close (sock);
- return -1;
+ resultbuf->gr_mem[cnt] = p;
+ total_len += len[cnt];
+ p += len[cnt];
}
- resultbuf->gr_mem = (char **)p;
- p += ((gr_resp.gr_mem_len + 1) * sizeof (char *));
- buflen -= ((gr_resp.gr_mem_len + 1) * sizeof (char *));
- resultbuf->gr_mem[gr_resp.gr_mem_len] = NULL;
+ if (total_len > buflen)
+ goto no_room;
- for (i = 0; i < gr_resp.gr_mem_len; ++i)
+ if (__read (sock, resultbuf->gr_mem[0], total_len) != total_len)
{
- size_t len;
- nbytes = read (sock, &len, sizeof (len));
- if (nbytes != sizeof (len))
- {
- close (sock);
- return 1;
- }
-
- if (buflen < (len + 1))
- {
- __set_errno (ERANGE);
- close (sock);
- return -1;
- }
- resultbuf->gr_mem[i] = p;
- p += len + 1;
- buflen -= (len + 1);
- nbytes = read (sock, resultbuf->gr_mem[i], len);
- resultbuf->gr_mem[i][len] = '\0';
- if (nbytes != len)
- {
- close (sock);
- return 1;
- }
+ __close (sock);
+ return -1;
}
- close (sock);
+
+ __close (sock);
return 0;
}
else
{
- close (sock);
+ __close (sock);
return -1;
}
}
projects / kopensolaris-gnu / glibc.git / blobdiff