1 files changed, 25 insertions, 3 deletions

diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index dd1a13984..f384c174c 100644
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -27,10 +27,34 @@
 RCSID("$OpenBSD: monitor_fdpass.c,v 1.6 2004/08/13 02:51:48 djm Exp $");
 
 #include <sys/uio.h>
+#include <sys/utsname.h>
 
 #include "log.h"
 #include "monitor_fdpass.h"
 
+static int
+cmsg_type_is_broken(void)
+{
+        static int broken_cmsg_type = -1;
+
+        if (broken_cmsg_type != -1)
+                return broken_cmsg_type;
+        else {
+                struct utsname uts;
+                /* If uname() fails, play safe and assume that cmsg_type
+                 * isn't broken.
+                 */
+                if (!uname(&uts) &&
+                    strcmp(uts.sysname, "Linux") == 0 &&
+                    strncmp(uts.release, "2.0.", 4) == 0)
+                        broken_cmsg_type = 1;
+                else
+                        broken_cmsg_type = 0;
+        }
+
+        return broken_cmsg_type;
+}
+
 void
 mm_send_fd(int sock, int fd)
 {
@@ -115,11 +139,9 @@ mm_receive_fd(int sock)
         cmsg = CMSG_FIRSTHDR(&msg);
         if (cmsg == NULL)
                 fatal("%s: no message header", __func__);
-#ifndef BROKEN_CMSG_TYPE
-        if (cmsg->cmsg_type != SCM_RIGHTS)
+        if (!cmsg_type_is_broken() && 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;