diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-07-14 02:17:58 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-07-14 02:17:58 +0000 |
| commit | a08ab89700a4a2e60c4c99df5b23960427e19eeb (patch) | |
| tree | f7b8c5e14ac2549cead4deec12802316937a9ea3 | |
| parent | 7529e67ed84e9af2fcfec3eca1f0e18ece7e5475 (diff) | |
| download | glibc-a08ab89700a4a2e60c4c99df5b23960427e19eeb.zip glibc-a08ab89700a4a2e60c4c99df5b23960427e19eeb.tar.gz glibc-a08ab89700a4a2e60c4c99df5b23960427e19eeb.tar.bz2 | |
* nscd/connections.c (send_ro_fd): Make sure BUF is aligned correctly.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | nscd/connections.c | 9 |
2 files changed, 8 insertions, 2 deletions
@@ -1,5 +1,6 @@ 2005-07-13 Ulrich Drepper <drepper@redhat.com> + * nscd/connections.c (send_ro_fd): Make sure BUF is aligned correctly. * nscd/nscd_helper.c (wait_on_socket): New function. (get_mapping): Use wait_on_socket instead of poll. The former handles EINTR of poll correctly. diff --git a/nscd/connections.c b/nscd/connections.c index 8179cb2..9dc852a 100644 --- a/nscd/connections.c +++ b/nscd/connections.c @@ -604,9 +604,14 @@ send_ro_fd (struct database_dyn *db, char *key, int fd) iov[0].iov_len = strlen (key) + 1; /* Prepare the control message to transfer the descriptor. */ - char buf[CMSG_SPACE (sizeof (int))]; + union + { + struct cmsghdr hdr; + char bytes[CMSG_SPACE (sizeof (int))]; + } buf; struct msghdr msg = { .msg_iov = iov, .msg_iovlen = 1, - .msg_control = buf, .msg_controllen = sizeof (buf) }; + .msg_control = buf.bytes, + .msg_controllen = sizeof (buf) }; struct cmsghdr *cmsg = CMSG_FIRSTHDR (&msg); cmsg->cmsg_level = SOL_SOCKET; |