diff options
author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2004-01-07 11:10:17 +0000 |
---|---|---|
committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2004-01-07 11:10:17 +0000 |
commit | d95e11bf7e5a59b5c3f81bd8dfc2918ee7d3bada (patch) | |
tree | d7e09b6d73cb37aa875779151439b14df7273b87 /crypto/openssh/monitor_fdpass.c | |
parent | dcf5581978ae9708715473af978f587c1ad7caf7 (diff) | |
download | src-d95e11bf7e5a59b5c3f81bd8dfc2918ee7d3bada.tar.gz src-d95e11bf7e5a59b5c3f81bd8dfc2918ee7d3bada.zip |
Vendor import of OpenSSH 3.7.1p2.
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=124208
Diffstat (limited to 'crypto/openssh/monitor_fdpass.c')
-rw-r--r-- | crypto/openssh/monitor_fdpass.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/openssh/monitor_fdpass.c b/crypto/openssh/monitor_fdpass.c index 641ce721ef51..22b7882bd729 100644 --- a/crypto/openssh/monitor_fdpass.c +++ b/crypto/openssh/monitor_fdpass.c @@ -113,9 +113,11 @@ mm_receive_fd(int socket) fatal("%s: no fd", __func__); #else cmsg = CMSG_FIRSTHDR(&msg); +#ifndef BROKEN_CMSG_TYPE if (cmsg->cmsg_type != SCM_RIGHTS) fatal("%s: expected type %d got %d", __func__, SCM_RIGHTS, cmsg->cmsg_type); +#endif fd = (*(int *)CMSG_DATA(cmsg)); #endif return fd; |