D29642.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D29642.diff
View Options

	diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
	--- a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
	+++ b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
	@@ -9,4 +9,7 @@
	DEFS= ${MOD}_tree.def
	BMIBS= BEGEMOT-PF-MIB.txt

	+CFLAGS+= -I${SRCTOP}/lib/libpfctl -I${OBJTOP}/lib/libpfctl
	+LIBADD+= pfctl
	+
	.include <bsd.snmpmod.mk>
	diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
	--- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
	+++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
	@@ -38,6 +38,7 @@

	#include <errno.h>
	#include <fcntl.h>
	+#include <libpfctl.h>
	#include <stdint.h>
	#include <stdio.h>
	#include <stdlib.h>
	@@ -1528,7 +1529,8 @@

	for (nr = pr.nr, i = 0; i < nr; i++) {
	pr.nr = i;
	- if (ioctl(dev, DIOCGETRULE, &pr)) {
	+ if (pfctl_add_rule(dev, &pr.rule, pr.anchor, pr.anchor_call,
	+ pr.ticket, pr.pool_ticket)) {
	syslog(LOG_ERR, "pfl_scan_ruleset: ioctl(DIOCGETRULE):"
	" %s", strerror(errno));
	goto err;