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 /libexec/login_skey | |
| 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 'libexec/login_skey')
| -rw-r--r-- | libexec/login_skey/login_skey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libexec/login_skey/login_skey.c b/libexec/login_skey/login_skey.c index a47c162b9b3..b41dac6e06f 100644 --- a/libexec/login_skey/login_skey.c +++ b/libexec/login_skey/login_skey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login_skey.c,v 1.21 2008/03/15 16:19:02 deraadt Exp $ */ +/* $OpenBSD: login_skey.c,v 1.22 2008/03/24 16:11:00 deraadt Exp $ */ /* * Copyright (c) 2000, 2001, 2004 Todd C. Miller <Todd.Miller@courtesan.com> @@ -270,7 +270,7 @@ send_fd(int sock) memset(&msg, 0, sizeof(msg)); msg.msg_control = &cmsgbuf.buf; - msg.msg_controllen = CMSG_LEN(sizeof(int)); + msg.msg_controllen = sizeof(cmsgbuf.buf); cmp = CMSG_FIRSTHDR(&msg); cmp->cmsg_len = CMSG_LEN(sizeof(int)); |