diff options
| author | bz <bz@FreeBSD.org> | 2011-09-27 13:27:17 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2011-09-27 13:27:17 +0000 |
| commit | 221b0dbe0c46f6d460aad1fa5dce37bedf054db3 (patch) | |
| tree | 5396173c83dc2000247d17e1fc189ef71122a8a8 /sys/netinet | |
| parent | f15c4ba986df76cc39987971217719f5ec3b4b06 (diff) | |
| download | FreeBSD-src-221b0dbe0c46f6d460aad1fa5dce37bedf054db3.zip FreeBSD-src-221b0dbe0c46f6d460aad1fa5dce37bedf054db3.tar.gz | |
Unbreak no-ip and no-inet6 module builds with ipfw. For now continue to
build the ip_fw_pfil.c hooks and ipfw even in case of no-ip under the
assumption that the private L2 hook (which hopefully eventually will be a
pfil hook as well) can still be useful.
Allow building the module without inet as well.
Glanced at by: jhb
MFC after: 3 days
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ipfw/ip_fw_pfil.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/ipfw/ip_fw_pfil.c b/sys/netinet/ipfw/ip_fw_pfil.c index c470b1f..a09ca79 100644 --- a/sys/netinet/ipfw/ip_fw_pfil.c +++ b/sys/netinet/ipfw/ip_fw_pfil.c @@ -31,11 +31,11 @@ __FBSDID("$FreeBSD$"); #if !defined(KLD_MODULE) #include "opt_ipdn.h" #include "opt_inet.h" +#include "opt_inet6.h" #ifndef INET #error IPFIREWALL requires INET. #endif /* INET */ #endif /* KLD_MODULE */ -#include "opt_inet6.h" #include <sys/param.h> #include <sys/systm.h> @@ -154,7 +154,7 @@ again: /* next_hop may be set by ipfw_chk */ if (args.next_hop == NULL && args.next_hop6 == NULL) break; /* pass */ -#ifndef IPFIREWALL_FORWARD +#if !defined(IPFIREWALL_FORWARD) || (!defined(INET6) && !defined(INET)) ret = EACCES; #else { @@ -205,7 +205,7 @@ again: #endif m_tag_prepend(*m0, fwd_tag); } -#endif +#endif /* IPFIREWALL_FORWARD */ break; case IP_FW_DENY: |
