diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-05-02 20:48:21 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-05-02 20:48:21 +1000 |
commit | 3c01654deb235191d798a5254561624872a7f010 (patch) | |
tree | 71ae1572d4f5440888b9f3ddc1c7ef7512dc7ab6 /monitor_fdpass.c | |
parent | eab4bae03894f07ea556db4d781795c724245af7 (diff) |
- (dtucker) Bug #544: ignore invalid cmsg_type on Linux 2.0 kernels,
privsep should now work.
Diffstat (limited to 'monitor_fdpass.c')
-rw-r--r-- | monitor_fdpass.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/monitor_fdpass.c b/monitor_fdpass.c index 641ce721e..22b7882bd 100644 --- a/monitor_fdpass.c +++ b/monitor_fdpass.c | |||
@@ -113,9 +113,11 @@ mm_receive_fd(int socket) | |||
113 | fatal("%s: no fd", __func__); | 113 | fatal("%s: no fd", __func__); |
114 | #else | 114 | #else |
115 | cmsg = CMSG_FIRSTHDR(&msg); | 115 | cmsg = CMSG_FIRSTHDR(&msg); |
116 | #ifndef BROKEN_CMSG_TYPE | ||
116 | if (cmsg->cmsg_type != SCM_RIGHTS) | 117 | if (cmsg->cmsg_type != SCM_RIGHTS) |
117 | fatal("%s: expected type %d got %d", __func__, | 118 | fatal("%s: expected type %d got %d", __func__, |
118 | SCM_RIGHTS, cmsg->cmsg_type); | 119 | SCM_RIGHTS, cmsg->cmsg_type); |
120 | #endif | ||
119 | fd = (*(int *)CMSG_DATA(cmsg)); | 121 | fd = (*(int *)CMSG_DATA(cmsg)); |
120 | #endif | 122 | #endif |
121 | return fd; | 123 | return fd; |