kernel/pf: In the ioctl code, make sure NPFLOG is actually defined.
authorSascha Wildner <saw@online.de>
Fri, 17 Feb 2012 11:22:26 +0000 (12:22 +0100)
committerSascha Wildner <saw@online.de>
Fri, 17 Feb 2012 11:22:26 +0000 (12:22 +0100)
The inclusion of if_pflog.h was conditionalized on NPFLOG but it is
if_pflog.h itself that actually defines NPFLOG (because it includes
use_pflog.h).

So if_pflog.h was never included and some initialization code in
the ioctls for adding and changing rules was not executed.

sys/net/pf/pf_ioctl.c

index e3c6657..8fb6914 100644 (file)
 #include <sys/md5.h>
 #include <net/pf/pfvar.h>
 
+#include <net/pf/if_pflog.h>
 #include <net/pf/if_pfsync.h>
 
-#if NPFLOG > 0
-#include <net/if_pflog.h>
-#endif /* NPFLOG > 0 */
-
 #ifdef INET6
 #include <netinet/ip6.h>
 #include <netinet/in_pcb.h>