X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/8656dc507aee9c5dcb3a6ad876565f5fcac425ae..7e4708e456b17131f28ae7f1ff7b5c7f86e2f803:/fdpass.c diff --git a/fdpass.c b/fdpass.c index 30808b4..0a11c2c 100644 --- a/fdpass.c +++ b/fdpass.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: fdpass.c,v 1.2 2004/04/08 01:36:11 mdw Exp $ + * $Id$ * * File descriptor passing * @@ -74,11 +74,11 @@ ssize_t fdpass_send(int sock, int fd, const void *p, size_t sz) msg.msg_namelen = 0; msg.msg_iov = &iov; msg.msg_iovlen = 1; - msg.msg_flags = 0; #ifdef HAVE_MSG_ACCRIGHTS msg.msg_accrights = &fd; msg.msg_accrightslen = sizeof(fd); #else + msg.msg_flags = 0; msg.msg_control = buf; msg.msg_controllen = sizeof(buf); cmsg = CMSG_FIRSTHDR(&msg); @@ -122,11 +122,11 @@ ssize_t fdpass_recv(int sock, int *fd, void *p, size_t sz) msg.msg_namelen = 0; msg.msg_iov = &iov; msg.msg_iovlen = 1; - msg.msg_flags = 0; #ifdef HAVE_MSG_ACCRIGHTS msg.msg_accrights = fd; msg.msg_accrightslen = sizeof(*fd); #else + msg.msg_flags = 0; msg.msg_control = buf; msg.msg_controllen = sizeof(buf); #endif