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

	reqdata.

diff --git a/ChangeLog b/ChangeLog
index 03983491855a594b7e3c9db27eb8d276122d55ed..d190358ff9389f53a8c7422d4f964101ef79945c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 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
        change: don't pass NULL in place of an integer.
 

diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c
index 577c6a052ae22173cf6cdcb3cea158f4789bd4c9..1f56ccf6aad542a3e7ca6d5a6fc124f3ab53fe0b 100644 (file)
--- a/nscd/nscd_helper.c
+++ b/nscd/nscd_helper.c
@@ -108,6 +108,7 @@ open_socket (request_type type, const char *key, size_t keylen)
     request_header req;
     char key[keylen];
   } reqdata;
+  size_t real_sizeof_reqdata = sizeof (request_header) + keylen;
 
   /* Make socket non-blocking.  */
   __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
 #endif
       ssize_t wres = TEMP_FAILURE_RETRY (__send (sock, &reqdata,
-                                                sizeof (reqdata),
+                                                real_sizeof_reqdata,
                                                 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.  */
        return sock;