tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 15:54:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2004/08/13 02:51:48

Browse Source 
[monitor_fdpass.c]
     extra check for no message case; ok markus, deraadt, hshoexer, henning
This commit is contained in:
Darren Tucker 2004-08-13 21:29:02 +10:00
parent 6e37037fea
commit 1ef0bc0b0a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -18,6 +18,9 @@
- jmc@cvs.openbsd.org 2004/08/13 00:01:43 - jmc@cvs.openbsd.org 2004/08/13 00:01:43
[ssh-keygen.1] [ssh-keygen.1]
kill whitespace at eol; kill whitespace at eol;
- djm@cvs.openbsd.org 2004/08/13 02:51:48
[monitor_fdpass.c]
extra check for no message case; ok markus, deraadt, hshoexer, henning
20040812 20040812
- (dtucker) [sshd.c] Remove duplicate variable imported during sync. - (dtucker) [sshd.c] Remove duplicate variable imported during sync.
@ -1615,4 +1618,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3503 2004/08/13 11:23:25 dtucker Exp $ $Id: ChangeLog,v 1.3504 2004/08/13 11:29:02 dtucker Exp $

4
monitor_fdpass.c
View File

@ -24,7 +24,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: monitor_fdpass.c,v 1.5 2004/06/21 17:36:31 avsm Exp $"); RCSID("$OpenBSD: monitor_fdpass.c,v 1.6 2004/08/13 02:51:48 djm Exp $");
#include <sys/uio.h> #include <sys/uio.h>
@ -113,6 +113,8 @@ mm_receive_fd(int sock)
fatal("%s: no fd", __func__); fatal("%s: no fd", __func__);
#else #else
cmsg = CMSG_FIRSTHDR(&msg); cmsg = CMSG_FIRSTHDR(&msg);
if (cmsg == NULL)
fatal("%s: no message header", __func__);
#ifndef BROKEN_CMSG_TYPE #ifndef BROKEN_CMSG_TYPE
if (cmsg->cmsg_type != SCM_RIGHTS) if (cmsg->cmsg_type != SCM_RIGHTS)
fatal("%s: expected type %d got %d", __func__, fatal("%s: expected type %d got %d", __func__,