diff options
| author | andre <andre@FreeBSD.org> | 2004-08-19 17:59:26 +0000 |
|---|---|---|
| committer | andre <andre@FreeBSD.org> | 2004-08-19 17:59:26 +0000 |
| commit | efb29124a79205df4178aae50cce045127a6940a (patch) | |
| tree | 179685b5cd41564c9e1bd73d36bc0ab3595b36a3 /sys/netinet | |
| parent | 14296889b232e65933cc0f2512e877cc0019382b (diff) | |
| download | FreeBSD-src-efb29124a79205df4178aae50cce045127a6940a.zip FreeBSD-src-efb29124a79205df4178aae50cce045127a6940a.tar.gz | |
Do not unconditionally ignore IPDIVERT and IPFIREWALL_FORWARD when building
the ipfw KLD.
For IPFIREWALL_FORWARD this does not have any side effects. If the module
has it but not the kernel it just doesn't do anything.
For IPDIVERT the KLD will be unloadable if the kernel doesn't have IPDIVERT
compiled in too. However this is the least disturbing behaviour. The user
can just recompile either module or the kernel to match the other one. The
access to the machine is not denied if ipfw refuses to load.
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_fw2.c | 2 | ||||
| -rw-r--r-- | sys/netinet/ip_fw_pfil.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c index 821ef6a..2737611 100644 --- a/sys/netinet/ip_fw2.c +++ b/sys/netinet/ip_fw2.c @@ -32,7 +32,6 @@ * Implement IP packet firewall (new version) */ -#if !defined(KLD_MODULE) #include "opt_ipfw.h" #include "opt_ipdn.h" #include "opt_ipdivert.h" @@ -41,7 +40,6 @@ #ifndef INET #error IPFIREWALL requires INET. #endif /* INET */ -#endif #define IPFW2 1 #if IPFW2 diff --git a/sys/netinet/ip_fw_pfil.c b/sys/netinet/ip_fw_pfil.c index d3837e32..234fd7d 100644 --- a/sys/netinet/ip_fw_pfil.c +++ b/sys/netinet/ip_fw_pfil.c @@ -26,7 +26,6 @@ * $FreeBSD$ */ -#if !defined(KLD_MODULE) #include "opt_ipfw.h" #include "opt_ipdn.h" #include "opt_ipdivert.h" @@ -34,7 +33,6 @@ #ifndef INET #error IPFIREWALL requires INET. #endif /* INET */ -#endif #include <sys/param.h> #include <sys/systm.h> |
