diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-03-24 16:11:09 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-03-24 16:11:09 +0000 |
| commit | 0bdf18c9edb2e6a9fa89a28e89d11e7b6785b1fd (patch) | |
| tree | bd0dc86a525e38150bde9f0c3d55ad9dfeb4e6a2 /gnu/usr.bin/perl | |
| parent | 6e48c70f167662c7aec42af9bafc316e322ef92a (diff) | |
msg_controllen has to be CMSG_SPACE so that the kernel can account for
each cmsg_len (ie. msg_controllen = sum of CMSG_ALIGN(cmsg_len). This
works now that kernel fd passing has been fixed to accept a bit of
sloppiness because of this ABI repair.
lots of discussion with kettenis
Diffstat (limited to 'gnu/usr.bin/perl')
| -rw-r--r-- | gnu/usr.bin/perl/perl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/usr.bin/perl/perl.c b/gnu/usr.bin/perl/perl.c index c9799f0b349..1674458edd5 100644 --- a/gnu/usr.bin/perl/perl.c +++ b/gnu/usr.bin/perl/perl.c @@ -451,7 +451,7 @@ Perl_dump_sv_child(pTHX_ SV *sv) be open, the wait would be forever. */ msg.msg_control = control.control; - msg.msg_controllen = CMSG_LEN(sizeof(int)); + msg.msg_controllen = sizeof(control.control); /* We're a connected socket so we don't need a destination */ msg.msg_name = NULL; msg.msg_namelen = 0; @@ -716,7 +716,7 @@ perl_destruct(pTHXx) int got_fd; msg.msg_control = control.control; - msg.msg_controllen = CMSG_LEN(sizeof(int)); + msg.msg_controllen = sizeof(control.control); /* We're a connected socket so we don't need a source */ msg.msg_name = NULL; msg.msg_namelen = 0; |