Import of OpenSSH 3.7p1

[gssapi-openssh.git] / openssh / monitor_fdpass.c

diff --git a/openssh/monitor_fdpass.c b/openssh/monitor_fdpass.c
index 641ce721ef514b0fe85b900df5944258977a2d67..22b7882bd729f963f0df3c84dcdc2f93f4876c93 100644 (file)
--- a/openssh/monitor_fdpass.c
+++ b/openssh/monitor_fdpass.c
@@ -113,9 +113,11 @@ mm_receive_fd(int socket)
                fatal("%s: no fd", __func__);
 #else
        cmsg = CMSG_FIRSTHDR(&msg);
+#ifndef BROKEN_CMSG_TYPE
        if (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;