View | Details | Raw Unified | Return to bug 311 | Differences between
and this patch

Collapse All | Expand All

(-)./monitor_fdpass.c.orig-missing-scmrights2 (+8 lines)
Lines 24-29 Link Here
24
 */
24
 */
25
25
26
#include "includes.h"
26
#include "includes.h"
27
28
#ifndef SCM_RIGHTS
29
#define SCM_RIGHTS 0x01
30
#endif /* SCM_RIGHTS */
31
27
RCSID("$OpenBSD: monitor_fdpass.c,v 1.3 2002/06/04 23:05:49 markus Exp $");
32
RCSID("$OpenBSD: monitor_fdpass.c,v 1.3 2002/06/04 23:05:49 markus Exp $");
28
33
29
#include <sys/uio.h>
34
#include <sys/uio.h>
Lines 112-120 Link Here
112
		fatal("%s: no fd", __func__);
117
		fatal("%s: no fd", __func__);
113
#else
118
#else
114
	cmsg = CMSG_FIRSTHDR(&msg);
119
	cmsg = CMSG_FIRSTHDR(&msg);
120
#if 0
121
        /* Linux kernel 2.0.x doesn't handle cmsg_type in recvmsg(). */
115
	if (cmsg->cmsg_type != SCM_RIGHTS)
122
	if (cmsg->cmsg_type != SCM_RIGHTS)
116
		fatal("%s: expected type %d got %d", __func__,
123
		fatal("%s: expected type %d got %d", __func__,
117
		    SCM_RIGHTS, cmsg->cmsg_type);
124
		    SCM_RIGHTS, cmsg->cmsg_type);
125
#endif /* 0 */
118
	fd = (*(int *)CMSG_DATA(cmsg));
126
	fd = (*(int *)CMSG_DATA(cmsg));
119
#endif
127
#endif
120
	return fd;
128
	return fd;

Return to bug 311