mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
50304ef057
1998-07-16 10:23 Ulrich Drepper <drepper@cygnus.com> * argp/argp-fmtstream.c: Unify names of used global functions. * argp/argp-help.c: Likewise. * assert/assert-perr.c: Likewise * assert/assert.c: Likewise * dirent/scandir.c: Likewise * dirent/scandir64.c: Likewise * dirent/versionsort.c: Likewise * dirent/versionsort64.c: Likewise * gmon/bb_exit_func.c: Likewise. * gmon/gmon.c: Likewise. * grp/initgroups.c: Likewise. * iconv/gconv_conf.c: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent_r.c: Likewise. * inet/inet_ntoa.c: Likewise. * inet/rcmd.c: Likewise. * inet/rexec.c: Likewise. * inet/ruserpass.c: Likewise. * io/fts.c: Likewise. * io/ftw.c: Likewise. * io/ftw64.c: Likewise. * io/getdirname.c: Likewise. * io/getwd.c: Likewise. * io/lockf.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iopopen.c: Likewise. * login/utmp_daemon.c: Likewise. * malloc/mtrace.c: Likewise. * malloc/obstack.c * misc/daemon.c: Likewise. * misc/efgcvt_r.c: Likewise. * misc/err.c: Likewise. * misc/error.c: Likewise. * misc/fstab.c: Likewise. * misc/getpass.c: Likewise. * misc/getttyent.c: Likewise. * misc/mntent_r.c: Likewise. * misc/search.h: Likewise. * misc/syslog.c: Likewise. * nscd/nscd_getgr_r.c: Likewise. * nscd/nscd_getpw_r.c: Likewise. * posix/getpgrp.c: Likewise. * posix/wordexp.c: Likewise. * pwd/fgetpwent_r.c: Likewise. * pwd/getpw.c: Likewise. * resolv/herror.c: Likewise. * resolv/res_init.c: Likewise. * shadow/fgetspent_r.c: Likewise. * shadow/lckpwdf.c: Likewise. * signal/sigrelse.c: Likewise. * stdio-common/asprintf.c: Likewise. * stdio-common/dprintf.c: Likewise. * stdio-common/getw.c: Likewise. * stdio-common/putw.c: Likewise. * stdio-common/snprintf.c: Likewise. * stdio-common/sprintf.c: Likewise. * stdio-common/sscanf.c: Likewise. * stdlib/lrand48_r.c: Likewise. * stdlib/mrand48_r.c: Likewise. * string/argz-replace.c: Likewise. * string/envz.c: Likewise. * sunrpc/auth_des.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/clnt_gen.c: Likewise. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_simp.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/get_myaddr.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/netname.c: Likewise. * sunrpc/openchild.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/rpc_dtable.c: Likewise. * sunrpc/rtime.c: Likewise. * sunrpc/svc_run.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/svcauth_des.c: Likewise. * sunrpc/xdr_array.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. * sysdeps/generic/abort.c: Likewise. * sysdeps/generic/dl-sysdep.c: Likewise. * sysdeps/generic/fstatfs64.c: Likewise. * sysdeps/generic/ftruncate64.c: Likewise. * sysdeps/generic/getrlimit64.c: Likewise. * sysdeps/generic/glob.c: Likewise. * sysdeps/generic/prof-freq.c: Likewise. * sysdeps/generic/putenv.c: Likewise. * sysdeps/generic/statfs64.c: Likewise. * sysdeps/generic/ttyname_r.c: Likewise. * sysdeps/generic/utmp_file.c: Likewise. * sysdeps/generic/vlimit.c: Likewise. * sysdeps/generic/vtimes.c: Likewise. * sysdeps/posix/cuserid.c: Likewise. * sysdeps/posix/euidaccess.c: Likewise. * sysdeps/posix/mkstemp.c: Likewise. * sysdeps/posix/mktemp.c: Likewise. * sysdeps/posix/pread.c: Likewise. * sysdeps/posix/pread64.c: Likewise. * sysdeps/posix/profil.c: Likewise. * sysdeps/posix/pwrite.c: Likewise. * sysdeps/posix/pwrite64.c: Likewise. * sysdeps/posix/sigblock.c: Likewise. * sysdeps/posix/sigpause.c: Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/posix/ttyname_r.c: Likewise. * sysdeps/posix/waitid.c: Likewise. * sysdeps/unix/getlogin_r.c: Likewise. * sysdeps/unix/grantpt.c: Likewise. * sysdeps/unix/rewinddir.c: Likewise. * sysdeps/unix/sysv/linux/gethostid.c: Likewise. * sysdeps/unix/sysv/linux/getpt.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/ptsname.c: Likewise. * sysdeps/unix/sysv/linux/sendmsg.c: Likewise. * sysdeps/unix/sysv/linux/statvfs.c: Likewise. * sysdeps/unix/sysv/linux/ttyname.c: Likewise. * sysdeps/unix/sysv/linux/ttyname_r.c: Likewise. * sysdeps/unix/sysv/linux/ulimit.c: Likewise. * sysdeps/unix/sysv/linux/unlockpt.c: Likewise. * sysvipc/sys/shm.h: Likewise. * time/ctime_r.c: Likewise. * time/strptime.c: Likewise. * wcsmbs/mbrlen.c: Likewise. * wcsmbs/wcsdup.c: Likewise. * wcsmbs/wcsxfrm.c: Likewise. * wctype/wcfuncs.c: Likewise. * sysdeps/unix/sysv/linux/i386/socker.S: Change to honor NO_WEAK_ALIAS. * sysdeps/unix/sysv/linux/accept.S: Don't generate __ name. * sysdeps/unix/sysv/linux/bind.S: Likewise. * sysdeps/unix/sysv/linux/getsockname.S: Likewise. * sysdeps/unix/sysv/linux/listen.S: Likewise. * sysdeps/unix/sysv/linux/recvfrom.S: Likewise. * sysdeps/unix/sysv/linux/sendto.S: Likewise. * sysdeps/unix/sysv/linux/setsockopt.S: Likewise. * grp/fgetgrent_r.c: Use explicit locking of the stream. * elf/Makefile (rtld-routines): Add dl-environ. * sysdeps/generic/dl-environ.c: New file. * libio/Makefile [REENTRANT] (routines): Add iofputs_u. * libio/Versions: Add fputs_unlocked. * libio/iofputs_u.c: New file. * libio/stdio.h: Add prototype for fputs_unlocked. * sunrpc/rpc/auth.h: Use __PMT instead of __P in type definitions. * sunrpc/rpc/clnt.h: Likewise. * sunrpc/rpc/pmap_clnt.h: Likewise. * sunrpc/rpc/svc.h: Likewise. * sunrpc/rpc/xdr.h: Likewise. * sysdeps/i386/memchr.S: Correct for more strict gas. * sysdeps/i386/fpu/bits/mathinline.h: Likewise. * sysdeps/libm-i387/i686/s_fdim.S: Likewise. * sysdeps/libm-i387/i686/s_fdimf.S: Likewise. * sysdeps/libm-i387/i686/s_fdiml.S: Likewise. 1998-07-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * configure.in: Change message for binutils version from 2.8.1.0.17->2.8.1.0.23. 1998-07-15 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h: Define LOC. Patch by John Tobey <jtobey@banta-im.com>.
211 lines
5.4 KiB
C
211 lines
5.4 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.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
|
|
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_getpw_r (const char *key, request_type type, struct passwd *resultbuf,
|
|
char *buffer, size_t buflen)
|
|
{
|
|
int sock = nscd_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);
|
|
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)
|
|
{
|
|
struct iovec vec[5];
|
|
char *p = buffer;
|
|
|
|
if (buflen < (pw_resp.pw_name_len + 1 + pw_resp.pw_passwd_len + 1
|
|
+ pw_resp.pw_gecos_len + 1 + pw_resp.pw_dir_len + 1
|
|
+ pw_resp.pw_shell_len + 1))
|
|
{
|
|
__set_errno (ERANGE);
|
|
__close (sock);
|
|
return -1;
|
|
}
|
|
|
|
/* get pw_name */
|
|
vec[0].iov_base = p;
|
|
vec[0].iov_len = pw_resp.pw_name_len;
|
|
p += pw_resp.pw_name_len + 1;
|
|
buflen -= (pw_resp.pw_name_len + 1);
|
|
/* get pw_passwd */
|
|
vec[1].iov_base = p;
|
|
vec[1].iov_len = pw_resp.pw_passwd_len;
|
|
p += pw_resp.pw_passwd_len + 1;
|
|
buflen -= (pw_resp.pw_passwd_len + 1);
|
|
/* get pw_gecos */
|
|
vec[2].iov_base = p;
|
|
vec[2].iov_len = pw_resp.pw_gecos_len;
|
|
p += pw_resp.pw_gecos_len + 1;
|
|
buflen -= (pw_resp.pw_gecos_len + 1);
|
|
/* get pw_dir */
|
|
vec[3].iov_base = p;
|
|
vec[3].iov_len = pw_resp.pw_dir_len;
|
|
p += pw_resp.pw_dir_len + 1;
|
|
buflen -= (pw_resp.pw_dir_len + 1);
|
|
/* get pw_pshell */
|
|
vec[4].iov_base = p;
|
|
vec[4].iov_len = pw_resp.pw_shell_len;
|
|
p += pw_resp.pw_shell_len + 1;
|
|
buflen -= (pw_resp.pw_shell_len + 1);
|
|
|
|
nbytes = __readv (sock, vec, 5);
|
|
if (nbytes != (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))
|
|
{
|
|
__close (sock);
|
|
return 1;
|
|
}
|
|
|
|
resultbuf->pw_name = vec[0].iov_base;
|
|
resultbuf->pw_name[pw_resp.pw_name_len] = '\0';
|
|
resultbuf->pw_passwd = vec[1].iov_base;
|
|
resultbuf->pw_passwd[pw_resp.pw_passwd_len] = '\0';
|
|
resultbuf->pw_uid = pw_resp.pw_uid;
|
|
resultbuf->pw_gid = pw_resp.pw_gid;
|
|
resultbuf->pw_gecos = vec[2].iov_base;
|
|
resultbuf->pw_gecos[pw_resp.pw_gecos_len] = '\0';
|
|
resultbuf->pw_dir = vec[3].iov_base;
|
|
resultbuf->pw_dir[pw_resp.pw_dir_len] = '\0';
|
|
resultbuf->pw_shell = vec[4].iov_base;
|
|
resultbuf->pw_shell[pw_resp.pw_shell_len] = '\0';
|
|
|
|
__close (sock);
|
|
return 0;
|
|
}
|
|
else
|
|
{
|
|
__close (sock);
|
|
return -1;
|
|
}
|
|
}
|