mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-13 00:30:07 +00:00
348ed5157b
1998-11-30 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nscd/nscd_getpw_r.c: Include nscd_proto.h for prototypes. * sysdeps/generic/errno-loc.c: Include <errno.h> for prototype, undefine errno to get variable. * sysdeps/unix/sysv/linux/i386/setfsuid.c: Include <sys/fsuid.h> instead of <unistd.h> for prototype. * sysdeps/unix/sysv/linux/i386/setfsgid.c: Likewise. 1998-11-30 Ulrich Drepper <drepper@cygnus.com> * misc/err.h: Correct comments and use protected attribute keywords. Reported by Joseph Myers <jsm28@cam.ac.uk>. 1998-11-29 Roland McGrath <roland@baalperazim.frob.com> * malloc/thread-m.h [_LIBC]: Include <bits/libc-tsd.h>, and remove tsd stuff from pthreads/cthreads libc sections. Use __libc_tsd_define for MALLOC key. [_LIBC] (tsd_key_t, tsd_key_create): Define to a zero-size type and a no-op, respectively. [_LIBC] (tsd_setspecific, tsd_getspecific): Use __libc_tsd_get/set. * elf/dl-error.c: Include <bits/libc-tsd.h>. Use __libc_tsd_define for DL_ERROR key. (tsd_setspecific, tsd_getspecific): Rewritten using __libc_tsd_get/set. * sysdeps/mach/hurd/bits/libc-tsd.h: New file. * sysdeps/generic/bits/libc-tsd.h: New file. * Makefile (distribute): Add bits/libc-tsd.h. 1998-10-12 Roland McGrath <roland@baalperazim.frob.com> * elf/dl-error.c: Remove kludge to check for ld.so load address. There is no need if weak undefined symbols are not used in ld.so; see linuxthreads/ChangeLog for changes to files linuxthreads/sysdeps/pthread/bits/libc-lock.h and linuxthreads/sysdeps/pthread/bits/libc-tsd.h. 1998-11-30 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/i386/bits/string.h (__memset_cc): Fix typo (s->__s). * sysdeps/i386/i486/bits/string.h: Add prototypes for all new inline functions. * sysdeps/i386/bits/string.h: Likewise. 1998-11-30 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/alpha/bits/ipc.h: Remove ipc_kludge. 1998-11-30 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * db2/progs/db_load/db_load.c (main): Avoid -Wparentheses warning.
186 lines
4.3 KiB
C
186 lines
4.3 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 <pwd.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-client.h"
|
|
#include "nscd_proto.h"
|
|
|
|
int __nss_not_use_nscd_passwd;
|
|
|
|
static int nscd_getpw_r (const char *key, request_type type,
|
|
struct passwd *resultbuf, char *buffer,
|
|
size_t buflen);
|
|
|
|
int
|
|
__nscd_getpwnam_r (const char *name, struct passwd *resultbuf, char *buffer,
|
|
size_t buflen)
|
|
{
|
|
if (name == NULL)
|
|
return 1;
|
|
|
|
return nscd_getpw_r (name, GETPWBYNAME, resultbuf, buffer, buflen);
|
|
}
|
|
|
|
int
|
|
__nscd_getpwuid_r (uid_t uid, struct passwd *resultbuf, char *buffer,
|
|
size_t buflen)
|
|
{
|
|
char *p = buffer;
|
|
int plen;
|
|
|
|
plen = __snprintf (buffer, buflen, "%d", uid);
|
|
if (plen == -1)
|
|
{
|
|
__set_errno (ERANGE);
|
|
return -1;
|
|
}
|
|
p = buffer + plen + 1;
|
|
|
|
return nscd_getpw_r (buffer, GETPWBYUID, resultbuf, p, buflen - plen - 1);
|
|
}
|
|
|
|
/* Create a socket connected to a name. */
|
|
static int
|
|
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_getpw_r (const char *key, request_type type, struct passwd *resultbuf,
|
|
char *buffer, size_t buflen)
|
|
{
|
|
int sock = open_socket ();
|
|
request_header req;
|
|
pw_response_header pw_resp;
|
|
ssize_t nbytes;
|
|
|
|
if (sock == -1)
|
|
{
|
|
__nss_not_use_nscd_passwd = 1;
|
|
return 1;
|
|
}
|
|
|
|
req.version = NSCD_VERSION;
|
|
req.type = type;
|
|
req.key_len = strlen (key) + 1;
|
|
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, &pw_resp, sizeof (pw_response_header));
|
|
if (nbytes != sizeof (pw_response_header))
|
|
{
|
|
__close (sock);
|
|
return 1;
|
|
}
|
|
|
|
if (pw_resp.found == -1)
|
|
{
|
|
/* The daemon does not cache this database. */
|
|
__close (sock);
|
|
__nss_not_use_nscd_passwd = 1;
|
|
return 1;
|
|
}
|
|
|
|
if (pw_resp.found == 1)
|
|
{
|
|
char *p = buffer;
|
|
size_t total = (pw_resp.pw_name_len + pw_resp.pw_passwd_len
|
|
+ pw_resp.pw_gecos_len + pw_resp.pw_dir_len
|
|
+ pw_resp.pw_shell_len);
|
|
|
|
if (buflen < total)
|
|
{
|
|
__set_errno (ERANGE);
|
|
__close (sock);
|
|
return -1;
|
|
}
|
|
|
|
/* Set the information we already have. */
|
|
resultbuf->pw_uid = pw_resp.pw_uid;
|
|
resultbuf->pw_gid = pw_resp.pw_gid;
|
|
|
|
/* get pw_name */
|
|
resultbuf->pw_name = p;
|
|
p += pw_resp.pw_name_len;
|
|
/* get pw_passwd */
|
|
resultbuf->pw_passwd = p;
|
|
p += pw_resp.pw_passwd_len;
|
|
/* get pw_gecos */
|
|
resultbuf->pw_gecos = p;
|
|
p += pw_resp.pw_gecos_len;
|
|
/* get pw_dir */
|
|
resultbuf->pw_dir = p;
|
|
p += pw_resp.pw_dir_len;
|
|
/* get pw_pshell */
|
|
resultbuf->pw_shell = p;
|
|
|
|
nbytes = __read (sock, buffer, total);
|
|
|
|
__close (sock);
|
|
|
|
return nbytes == total ? 0 : 1;
|
|
}
|
|
else
|
|
{
|
|
__close (sock);
|
|
return -1;
|
|
}
|
|
}
|