2 files changed, 7 insertions, 25 deletions

diff --git a/debian/changelog b/debian/changelog
index 718ce3924..4443394ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ openssh (1:5.2p1-2) UNRELEASED; urgency=low
       in sshd dying (LP: #497781).
   * Use host compiler for ssh-askpass-gnome when cross-compiling.
   * Don't run tests when cross-compiling.
+  * Drop change from 1:3.6.1p2-5 to disable cmsg_type check for file
+    descriptor passing when running on Linux 2.0.  The previous stable
+    release of Debian dropped support for Linux 2.4, let alone 2.0, so this
+    very likely has no remaining users depending on it.
 
  -- Colin Watson <cjwatson@debian.org>  Sun, 10 Jan 2010 22:06:28 +0000
 
diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index 3d3a78391..4b9a066bc 100644
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -32,7 +32,6 @@
 #ifdef HAVE_SYS_UN_H
 #include <sys/un.h>
 #endif
-#include <sys/utsname.h>
 
 #include <errno.h>
 #include <string.h>
@@ -41,29 +40,6 @@
 #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)
 {
@@ -176,11 +152,13 @@ mm_receive_fd(int sock)
                 return -1;
         }
 
-        if (!cmsg_type_is_broken() && cmsg->cmsg_type != SCM_RIGHTS) {
+#ifndef BROKEN_CMSG_TYPE
+        if (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;