head	1.3;
access;
symbols
	RELEASE_8_3_0:1.3
	RELEASE_9_0_0:1.3
	RELEASE_7_4_0:1.3
	RELEASE_8_2_0:1.3
	RELEASE_6_EOL:1.3
	RELEASE_8_1_0:1.3
	RELEASE_7_3_0:1.3
	RELEASE_8_0_0:1.3
	RELEASE_7_2_0:1.3
	RELEASE_7_1_0:1.3
	RELEASE_6_4_0:1.3
	RELEASE_5_EOL:1.3
	RELEASE_7_0_0:1.3
	RELEASE_6_3_0:1.3
	PRE_XORG_7:1.3
	RELEASE_4_EOL:1.3
	RELEASE_6_2_0:1.3
	RELEASE_6_1_0:1.3
	RELEASE_5_5_0:1.3
	RELEASE_6_0_0:1.3
	RELEASE_5_4_0:1.3
	RELEASE_4_11_0:1.3
	RELEASE_5_3_0:1.3
	RELEASE_4_10_0:1.3
	RELEASE_5_2_1:1.3
	RELEASE_5_2_0:1.3
	RELEASE_4_9_0:1.3
	RELEASE_5_1_0:1.3
	RELEASE_4_8_0:1.3
	RELEASE_5_0_0:1.3
	RELEASE_4_7_0:1.3
	RELEASE_4_6_2:1.3
	RELEASE_4_6_1:1.3
	RELEASE_4_6_0:1.3
	RELEASE_5_0_DP1:1.3
	RELEASE_4_5_0:1.3
	RELEASE_4_4_0:1.3
	RELEASE_4_3_0:1.3
	RELEASE_4_2_0:1.3
	RELEASE_4_1_1:1.3
	RELEASE_4_1_0:1.3
	RELEASE_3_5_0:1.3
	RELEASE_4_0_0:1.3
	RELEASE_3_4_0:1.3
	RELEASE_3_3_0:1.3
	RELEASE_3_2_0:1.3
	RELEASE_3_1_0:1.3
	RELEASE_2_2_8:1.2
	RELEASE_3_0_0:1.2
	RELEASE_2_2_7:1.2
	fwtk_2_1:1.3
	fwtk_1_3:1.1
	RELEASE_2_2_6:1.1
	RELEASE_2_2_5:1.1
	RELEASE_2_2_1:1.1
	RELEASE_2_2_2:1.1;
locks; strict;
comment	@# @;


1.3
date	98.12.10.16.31.13;	author obrien;	state Exp;
branches;
next	1.2;

1.2
date	98.04.18.08.57.23;	author obrien;	state Exp;
branches;
next	1.1;

1.1
date	97.03.07.12.33.43;	author obrien;	state Exp;
branches;
next	;


desc
@@


1.3
log
@* Fix compiling on 3.0.x.  They include headers in the most non-"standard"
  order I've ever seen.  Haven't these guys ever done Unix programming
  before?
* Quiet some compiling warnings.  For "security" software, this code should
  NOT have as many warnings and unused vars as it does.
@
text
@--- firewall.h.orig	Sun Mar  1 06:54:20 1998
+++ firewall.h	Thu Dec 10 08:26:28 1998
@@@@ -1,3 +1,10 @@@@
+/* I don't like including these here, but it is the least intrusive fix
+   I can see at the moment.  -- David O'Brien for the FreeBSD port */
+#include <stdlib.h>
+#include <stdio.h>
+/* #include <unistd.h> */	/* conflicts with gethostname() in socket.c */
+#include <string.h>
+
 /*-
  * Copyright (c) 1993, 1996, 1997 Trusted Information Systems, Incorporated
  * All rights reserved.
@@@@ -47,7 +54,7 @@@@
 system.
 */
 #ifndef	PERMFILE
-#define	PERMFILE	"/usr/local/etc/netperm-table"
+#define	PERMFILE	"%%BSD_PREFIX%%/etc/netperm-table"
 #endif
 
 /*
@@@@ -67,7 +74,7 @@@@
 
 /* Choose a system logging facility for the firewall toolkit.  */
 #ifndef	LFAC
-#define	LFAC	LOG_DAEMON
+#define	LFAC	LOG_LOCAL2
 #endif
 
 
@@@@ -89,7 +96,7 @@@@
 makes no difference. make sure that whichever your machine uses
 is defined below.
 */
-#if defined(SYSV) || defined(SCO5) || defined(OSF1) || defined(AIX)
+#if defined(SYSV) || defined(SCO5) || defined(OSF1) || defined(AIX) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 #define DIRECT_STRUCT   struct dirent 
 #else
 #define DIRECT_STRUCT   struct direct
@


1.2
log
@Upgrade to version 2.1.  Mixing of my stuff + two good submissions.

Submitted by:	"Scott A. Kenney" <saken@@rmta.ml.org>
                & "Eric J. Chet" <ejc@@bazzle.com>
@
text
@d2 13
a14 2
+++ firewall.h	Sat Apr 18 00:33:53 1998
@@@@ -47,7 +47,7 @@@@
d23 1
a23 1
@@@@ -67,7 +67,7 @@@@
d32 1
a32 1
@@@@ -89,7 +89,7 @@@@
@


1.1
log
@Respects ${PREFIX}
Broke up mega-patches into one/file.
@
text
@d1 12
a12 3
--- firewall.h.orig	Fri Nov  4 23:31:26 1994
+++ firewall.h	Wed May 15 21:28:28 1996
@@@@ -59,7 +59,7 @@@@
d21 1
a21 1
@@@@ -77,8 +77,7 @@@@
d25 5
a29 6
-#define DIRECT_STRUCT   struct direct
-/* #define DIRECT_STRUCT   struct dirent */
+#define DIRECT_STRUCT   struct dirent
 
 
 /*
@
