* nscd/nscd_helper.c (open_socket): Don't send padding bytes from

reqdata.
This commit is contained in:
Ulrich Drepper 2007-02-16 06:34:26 +00:00
parent 987f54c67c
commit 6eea8e0d48
2 changed files with 6 additions and 2 deletions

View File

@ -1,5 +1,8 @@
2007-02-15 Ulrich Drepper <drepper@redhat.com> 2007-02-15 Ulrich Drepper <drepper@redhat.com>
* nscd/nscd_helper.c (open_socket): Don't send padding bytes from
reqdata.
* sysdeps/unix/sysv/linux/x86_64/send.c (__libc_send): Cosmetic * sysdeps/unix/sysv/linux/x86_64/send.c (__libc_send): Cosmetic
change: don't pass NULL in place of an integer. change: don't pass NULL in place of an integer.

View File

@ -108,6 +108,7 @@ open_socket (request_type type, const char *key, size_t keylen)
request_header req; request_header req;
char key[keylen]; char key[keylen];
} reqdata; } reqdata;
size_t real_sizeof_reqdata = sizeof (request_header) + keylen;
/* Make socket non-blocking. */ /* Make socket non-blocking. */
__fcntl (sock, F_SETFL, O_RDWR | O_NONBLOCK); __fcntl (sock, F_SETFL, O_RDWR | O_NONBLOCK);
@ -135,9 +136,9 @@ open_socket (request_type type, const char *key, size_t keylen)
# define MSG_NOSIGNAL 0 # define MSG_NOSIGNAL 0
#endif #endif
ssize_t wres = TEMP_FAILURE_RETRY (__send (sock, &reqdata, ssize_t wres = TEMP_FAILURE_RETRY (__send (sock, &reqdata,
sizeof (reqdata), real_sizeof_reqdata,
MSG_NOSIGNAL)); MSG_NOSIGNAL));
if (__builtin_expect (wres == (ssize_t) sizeof (reqdata), 1)) if (__builtin_expect (wres == (ssize_t) real_sizeof_reqdata, 1))
/* We managed to send the request. */ /* We managed to send the request. */
return sock; return sock;