diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-05-30 02:12:57 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-05-30 02:12:57 +0000 |
| commit | b15a5a165339d99f4dd696f22eb53227671e1b7c (patch) | |
| tree | df0e361f461c1f4de76c81e5b9dc791ba6768ec8 /sys/net/if_bridge.c | |
| parent | d818215253f2f1d16376a6482ac14c27f16520a1 (diff) | |
Remove ipf. Darren Reed has interpreted his (old, new, whichever)
licence in a way that makes ipf not free according to the rules we
established over 5 years ago, at www.openbsd.org/goals.html (and those
same basic rules govern the other *BSD projects too). Specifically,
Darren says that modified versions are not permitted. But software
which OpenBSD uses and redistributes must be free to all (be they
people or companies), for any purpose they wish to use it, including
modification, use, peeing on, or even integration into baby mulching
machines or atomic bombs to be dropped on Australia. Furthermore, we
know of a number of companies using ipf with modification like us, who
are now in the same situation, and we hope that some of them will work
with us to fill this gap that now exists in OpenBSD (temporarily, we
hope).
Diffstat (limited to 'sys/net/if_bridge.c')
| -rw-r--r-- | sys/net/if_bridge.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index dc2fe6c6511..f6599495097 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.55 2001/05/11 04:56:15 jason Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.56 2001/05/30 02:12:24 deraadt Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -141,7 +141,7 @@ u_int8_t bridge_filterrule __P((struct brl_head *, struct ether_header *)); (a)->ether_addr_octet[2] == 0x5e) -#if defined(INET) && (defined(IPFILTER) || defined(IPFILTER_LKM)) +#if defined(INET) && defined(IPFILTER) /* * Filter hooks */ @@ -1002,7 +1002,7 @@ bridgeintr_frame(sc, m) return; } -#if defined(INET) && (defined(IPFILTER) || defined(IPFILTER_LKM)) +#if defined(INET) && defined(IPFILTER) m = bridge_filter(sc, src_if, &eh, m); if (m == NULL) return; @@ -1847,7 +1847,7 @@ bridge_flushrule(bif) return (0); } -#if defined(INET) && (defined(IPFILTER) || defined(IPFILTER_LKM)) +#if defined(INET) && defined(IPFILTER) /* * Filter IP packets by peeking into the ethernet frame. This violates |