aboutsummaryrefslogtreecommitdiff
path: root/nscd/nscd_getpw_r.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-03-12 09:35:57 +0000
committerUlrich Drepper <drepper@redhat.com>1998-03-12 09:35:57 +0000
commiteb13b9a02d939ee7440472c5a5f86e55f3adbd54 (patch)
treee75f923f922e03f20152e7badf2a8f3c9be03285 /nscd/nscd_getpw_r.c
parent2bcf29ba7c21c42db97411cf1fecd23dfd5ca3fa (diff)
downloadglibc-eb13b9a02d939ee7440472c5a5f86e55f3adbd54.tar
glibc-eb13b9a02d939ee7440472c5a5f86e55f3adbd54.tar.gz
glibc-eb13b9a02d939ee7440472c5a5f86e55f3adbd54.tar.bz2
glibc-eb13b9a02d939ee7440472c5a5f86e55f3adbd54.zip
Update.
1998-03-12 Matthias Urlichs <smurf@noris.de> * nscd/nscd.c: Ignore SIGPIPE. 1998-03-12 Ulrich Drepper <drepper@cygnus.com> * nscd/nscd_getgr_r.c: Use __ protected names. * nscd/nscd_getpw_r.c: Likewise. 1998-03-12 Matthias Urlichs <smurf@noris.de> * nscd/nscd_getpw_r.c: Use pw_*_len values correctly. * nscd/nscd_getpw_r.c: Fix length calculation in result check, null bytes are not transmitted. 1998-03-12 00:40 Franz Sirl <Franz.Sirl-kernel@lauterbach.com> * powerpc/syscalls.list: Correct typo. * alpha/syscalls.list: Likewise. * mips/syscalls.list: Likewise. 1998-03-12 Ulrich Drepper <drepper@cygnus.com> * socket/sys/socket.h: Add prototype for __socket.
Diffstat (limited to 'nscd/nscd_getpw_r.c')
-rw-r--r--nscd/nscd_getpw_r.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/nscd/nscd_getpw_r.c b/nscd/nscd_getpw_r.c
index 4804a4578a..fd512ab1b5 100644
--- a/nscd/nscd_getpw_r.c
+++ b/nscd/nscd_getpw_r.c
@@ -71,7 +71,7 @@ nscd_open_socket (void)
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);
@@ -80,7 +80,7 @@ nscd_open_socket (void)
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);
__set_errno (saved_errno);
@@ -142,9 +142,9 @@ __nscd_getpw_r (const char *key, request_type type, struct passwd *resultbuf,
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)
+ 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);
@@ -173,14 +173,14 @@ __nscd_getpw_r (const char *key, request_type type, struct passwd *resultbuf,
buflen -= (pw_resp.pw_dir_len + 1);
/* get pw_pshell */
vec[4].iov_base = p;
- vec[4].iov_len = pw_resp.pw_dir_len;
- p += pw_resp.pw_dir_len + 1;
- buflen -= (pw_resp.pw_dir_len + 1);
+ 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 + 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)
+ 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;