RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2008/03/13 01:49:53 

[monitor_fdpass.c]
     Correct CMSG_SPACE and CMSG_LEN usage everywhere in the tree. Due to
     an extensive discussion with otto, kettenis, millert, and hshoexer
This commit is contained in:
Damien Miller 2008-03-27 10:53:23 +11:00
parent 5447eb2454
commit f92e063872
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -9,6 +9,10 @@
[ssh.1 sshd.8 sshd_config.5] [ssh.1 sshd.8 sshd_config.5]
bump Mdocdate for pages committed in "febuary", necessary because bump Mdocdate for pages committed in "febuary", necessary because
of a typo in rcs.c; of a typo in rcs.c;
- deraadt@cvs.openbsd.org 2008/03/13 01:49:53
[monitor_fdpass.c]
Correct CMSG_SPACE and CMSG_LEN usage everywhere in the tree. Due to
an extensive discussion with otto, kettenis, millert, and hshoexer
20080315 20080315
- (djm) [regress/test-exec.sh] Quote putty-related variables in case they are - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are
@ -3777,4 +3781,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4882 2008/03/26 23:50:21 djm Exp $ $Id: ChangeLog,v 1.4883 2008/03/26 23:53:23 djm Exp $

17
monitor_fdpass.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: monitor_fdpass.c,v 1.14 2008/03/02 18:19:35 deraadt Exp $ */ /* $OpenBSD: monitor_fdpass.c,v 1.15 2008/03/13 01:49:53 deraadt Exp $ */
/* /*
* Copyright 2001 Niels Provos <provos@citi.umich.edu> * Copyright 2001 Niels Provos <provos@citi.umich.edu>
* All rights reserved. * All rights reserved.
@ -52,7 +52,8 @@ mm_send_fd(int sock, int fd)
union { union {
struct cmsghdr hdr; struct cmsghdr hdr;
char tmp[CMSG_SPACE(sizeof(int))]; char tmp[CMSG_SPACE(sizeof(int))];
} tmp; char buf[CMSG_SPACE(sizeof(int))];
} cmsgbuf;
struct cmsghdr *cmsg; struct cmsghdr *cmsg;
#endif #endif
@ -61,8 +62,8 @@ mm_send_fd(int sock, int fd)
msg.msg_accrights = (caddr_t)&fd; msg.msg_accrights = (caddr_t)&fd;
msg.msg_accrightslen = sizeof(fd); msg.msg_accrightslen = sizeof(fd);
#else #else
msg.msg_control = (caddr_t)&tmp; msg.msg_control = (caddr_t)&cmsgbuf.buf;
msg.msg_controllen = CMSG_LEN(sizeof(int)); msg.msg_controllen = sizeof(cmsgbuf.buf);
cmsg = CMSG_FIRSTHDR(&msg); cmsg = CMSG_FIRSTHDR(&msg);
cmsg->cmsg_len = CMSG_LEN(sizeof(int)); cmsg->cmsg_len = CMSG_LEN(sizeof(int));
cmsg->cmsg_level = SOL_SOCKET; cmsg->cmsg_level = SOL_SOCKET;
@ -104,9 +105,9 @@ mm_receive_fd(int sock)
int fd; int fd;
#ifndef HAVE_ACCRIGHTS_IN_MSGHDR #ifndef HAVE_ACCRIGHTS_IN_MSGHDR
union { union {
char tmp[CMSG_SPACE(sizeof(int))];
struct cmsghdr hdr; struct cmsghdr hdr;
} tmp; char buf[CMSG_SPACE(sizeof(int))];
} cmsgbuf;
struct cmsghdr *cmsg; struct cmsghdr *cmsg;
#endif #endif
@ -119,8 +120,8 @@ mm_receive_fd(int sock)
msg.msg_accrights = (caddr_t)&fd; msg.msg_accrights = (caddr_t)&fd;
msg.msg_accrightslen = sizeof(fd); msg.msg_accrightslen = sizeof(fd);
#else #else
msg.msg_control = &tmp; msg.msg_control = &cmsgbuf.buf;
msg.msg_controllen = sizeof(tmp); msg.msg_controllen = sizeof(cmsgbuf.buf);
#endif #endif
if ((n = recvmsg(sock, &msg, 0)) == -1) { if ((n = recvmsg(sock, &msg, 0)) == -1) {