1 files changed, 25 insertions, 3 deletions

diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index 4b9a066bc..3d3a78391 100644
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -32,6 +32,7 @@
 #ifdef HAVE_SYS_UN_H
 #include <sys/un.h>
 #endif
+#include <sys/utsname.h>
 
 #include <errno.h>
 #include <string.h>
@@ -40,6 +41,29 @@
 #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;
+}
+
 int
 mm_send_fd(int sock, int fd)
 {
@@ -152,13 +176,11 @@ mm_receive_fd(int sock)
                 return -1;
         }
 
-#ifndef BROKEN_CMSG_TYPE
-        if (cmsg->cmsg_type != SCM_RIGHTS) {
+        if (!cmsg_type_is_broken() && cmsg->cmsg_type != SCM_RIGHTS) {
                 error("%s: expected type %d got %d", __func__,
                     SCM_RIGHTS, cmsg->cmsg_type);
                 return -1;
         }
-#endif
         fd = (*(int *)CMSG_DATA(cmsg));
 #endif
         return fd;