openssh unix dev - Oct 2006 - v4.4p1: compile fix

Hello,

I've attached a small unified diff fixing a compilation problem
under linux v2.0.35:

? monitor_fdpass.c:
  <sys/un.h> need to be included in order to get the structures
  fro cmsg... defined.

? --with-mantype=man
  I would prefer this to be the default, but YMMV.

THX for listening.

CU Tom.
(Thomas M.Ott)
Germany
-------------- next part --------------
--- openssh-4.4p1/monitor_fdpass.c.orig	2006-08-05 04:39:40.000000000 +0200
+++ openssh-4.4p1/monitor_fdpass.c	2006-10-15 13:10:51.000000000 +0200
@@ -29,7 +29,9 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
-
+#ifdef	__linux__	/* (ThMO) */
+  #include <sys/un.h>	/* for cmsg... -- linux 2.0.35 (ThMO) */
+#endif
 #include <errno.h>
 #include <string.h>
 #include <stdarg.h>

On Sun, Oct 15, 2006 at 01:55:00PM +0200, ThMO wrote:
> I've attached a small unified diff fixing a compilation problem
> under linux v2.0.35:
> 
> ? monitor_fdpass.c:
>   <sys/un.h> need to be included in order to get the structures
>   fro cmsg... defined.
Thanks, a slightly different patch has been applied.

Index: monitor_fdpass.c
==================================================================RCS file:
/var/cvs/openssh/monitor_fdpass.c,v
retrieving revision 1.20
diff -u -p -r1.20 monitor_fdpass.c
--- monitor_fdpass.c	5 Aug 2006 02:39:40 -0000	1.20
+++ monitor_fdpass.c	16 Oct 2006 09:48:20 -0000
@@ -29,6 +29,9 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
 
 #include <errno.h>
 #include <string.h>

-- 
Darren Tucker (dtucker at zip.com.au)
GPG key 8FF4FA69 / D9A3 86E9 7EEE AF4B B2D4  37C9 C982 80C7 8FF4 FA69
    Good judgement comes with experience. Unfortunately, the experience
usually comes from bad judgement.