Darren Reed wrote: > Do the diffs below do the trick? ... > diff -c -r2.243.2.86 fil.c > *** fil.c 1 Sep 2006 14:09:00 -0000 2.243.2.86 > --- fil.c 18 Oct 2006 11:32:36 -0000 > *************** > *** 32,37 **** > --- 32,43 ---- > #else > # include <sys/ioctl.h> > #endif > + #if SOLARIS ...
No, because SOLARIS is not defined in this place. Either use SOLARIS2 instead or move the 6-line insertion after #include "netinet/ip_compat.h". And the bug in ip_fil_solaris.c reported by "Summum Bonum" regarding cp->cr_uid still remains. This is fixed by the following: --- ip_fil_solaris.c.ORI Mon Sep 25 12:21:35 2006 +++ ip_fil_solaris.c Thu Oct 19 12:19:55 2006 @@ -16,7 +16,11 @@ #include <sys/ioctl.h> #include <sys/filio.h> #include <sys/systm.h> +#if SOLARIS2 >= 10 +#include <sys/cred_impl.h> +#else #include <sys/cred.h> +#endif #include <sys/ddi.h> #include <sys/sunddi.h> #include <sys/ksynch.h>
