Allow the ipfw.ko module built with a kernel to honor any IPFIREWALL_*

options defined in the kernel config.  This more closely matches the
behavior of other modules which inherit configuration settings from the
kernel configuration during a kernel + modules build.

Reviewed by:	luigi
Approved by:	re (kib)
MFC after:	1 week
This commit is contained in:
John Baldwin 2011-09-12 21:09:56 +00:00
parent 2304f22dd9
commit 5bb3652f05
7 changed files with 7 additions and 7 deletions

View File

@ -8,7 +8,7 @@ KMOD= ipfw
SRCS= ip_fw2.c ip_fw_pfil.c
SRCS+= ip_fw_dynamic.c ip_fw_log.c
SRCS+= ip_fw_sockopt.c ip_fw_table.c
SRCS+= opt_inet6.h opt_ipsec.h
SRCS+= opt_inet6.h opt_ipfw.h opt_ipsec.h
CFLAGS+= -DIPFIREWALL
CFLAGS+= -I${.CURDIR}/../../contrib/pf

View File

@ -30,8 +30,8 @@ __FBSDID("$FreeBSD$");
* The FreeBSD IP packet firewall, main file
*/
#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
#if !defined(KLD_MODULE)
#include "opt_ipdivert.h"
#include "opt_ipdn.h"
#include "opt_inet.h"

View File

@ -33,8 +33,8 @@ __FBSDID("$FreeBSD$");
* Dynamic rule support for ipfw
*/
#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
#if !defined(KLD_MODULE)
#include "opt_ipdivert.h"
#include "opt_ipdn.h"
#include "opt_inet.h"

View File

@ -30,8 +30,8 @@ __FBSDID("$FreeBSD$");
* Logging support for ipfw
*/
#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
#if !defined(KLD_MODULE)
#include "opt_ipdivert.h"
#include "opt_ipdn.h"
#include "opt_inet.h"

View File

@ -27,8 +27,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
#if !defined(KLD_MODULE)
#include "opt_ipdn.h"
#include "opt_inet.h"
#ifndef INET

View File

@ -33,8 +33,8 @@ __FBSDID("$FreeBSD$");
* the upper half of the ipfw code.
*/
#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
#if !defined(KLD_MODULE)
#include "opt_ipdivert.h"
#include "opt_ipdn.h"
#include "opt_inet.h"

View File

@ -39,8 +39,8 @@ __FBSDID("$FreeBSD$");
* from userland, because operations are typically fast.
*/
#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
#if !defined(KLD_MODULE)
#include "opt_ipdivert.h"
#include "opt_ipdn.h"
#include "opt_inet.h"