svn commit: r356864 - stable/12/usr.sbin/bsnmpd/modules/snmp_pf

[Shteryana Shopova]

Author: syrinx
Date: Sat Jan 18 10:44:32 2020
New Revision: 356864
URL: https://svnweb.freebsd.org/changeset/base/356864

Log:
  MFC r349264: Unbreak snmp_pf(3) after the changes introduced in r338209
  
  PR:		237011
  Event:		Vienna Hackathon 2019

Modified:
  stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
  stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
==============================================================================
--- stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c	Sat Jan 18 04:48:05 2020	(r356863)
+++ stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c	Sat Jan 18 10:44:32 2020	(r356864)
@@ -907,7 +907,7 @@ pf_tbladdr(struct snmp_context __unused *ctx, struct s
 }
 
 int
-pf_altq(struct snmp_context __unused *ctx, struct snmp_value *val,
+pf_altq_num(struct snmp_context __unused *ctx, struct snmp_value *val,
 	u_int sub, u_int __unused vindex, enum snmp_op op)
 {
 	asn_subid_t	which = val->var.subs[sub - 1];

Modified: stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def
==============================================================================
--- stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def	Sat Jan 18 04:48:05 2020	(r356863)
+++ stable/12/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def	Sat Jan 18 10:44:32 2020	(r356864)
@@ -174,7 +174,7 @@
 		)
 	      )
 	      (10 pfAltq
-	        (1 pfAltqQueueNumber INTEGER32 pf_altq GET)
+	        (1 pfAltqQueueNumber INTEGER32 pf_altq_num GET)
 		(2 pfAltqQueueTable
 		  (1 pfAltqQueueEntry : INTEGER32 pf_altqq
 		    (1 pfAltqQueueIndex INTEGER32)