Index: monitor_fdpass.c
===================================================================
RCS file: /cognet/ncvs/src/crypto/openssh/monitor_fdpass.c,v
retrieving revision 1.1.1.7
diff -u -p -r1.1.1.7 monitor_fdpass.c
--- monitor_fdpass.c	10 Nov 2006 16:38:34 -0000	1.1.1.7
+++ monitor_fdpass.c	30 Jan 2008 11:03:47 -0000
@@ -49,7 +49,10 @@ mm_send_fd(int sock, int fd)
 	char ch = '\0';
 	ssize_t n;
 #ifndef HAVE_ACCRIGHTS_IN_MSGHDR
-	char tmp[CMSG_SPACE(sizeof(int))];
+	union {
+		char tmp[CMSG_SPACE(sizeof(int))];
+		int unused;
+	} tmp;
 	struct cmsghdr *cmsg;
 #endif
 
@@ -58,7 +61,7 @@ mm_send_fd(int sock, int fd)
 	msg.msg_accrights = (caddr_t)&fd;
 	msg.msg_accrightslen = sizeof(fd);
 #else
-	msg.msg_control = (caddr_t)tmp;
+	msg.msg_control = (caddr_t)tmp.tmp;
 	msg.msg_controllen = CMSG_LEN(sizeof(int));
 	cmsg = CMSG_FIRSTHDR(&msg);
 	cmsg->cmsg_len = CMSG_LEN(sizeof(int));
@@ -94,7 +97,10 @@ mm_receive_fd(int sock)
 	char ch;
 	int fd;
 #ifndef HAVE_ACCRIGHTS_IN_MSGHDR
-	char tmp[CMSG_SPACE(sizeof(int))];
+	union {
+		char tmp[CMSG_SPACE(sizeof(int))];
+		int unused;
+	}	tmp;
 	struct cmsghdr *cmsg;
 #endif
 
@@ -107,8 +113,8 @@ mm_receive_fd(int sock)
 	msg.msg_accrights = (caddr_t)&fd;
 	msg.msg_accrightslen = sizeof(fd);
 #else
-	msg.msg_control = tmp;
-	msg.msg_controllen = sizeof(tmp);
+	msg.msg_control = &tmp.tmp;
+	msg.msg_controllen = sizeof(tmp.tmp);
 #endif
 
 	if ((n = recvmsg(sock, &msg, 0)) == -1)