Index: stable/9/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
===================================================================
--- stable/9/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile	(revision 301671)
+++ stable/9/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile	(revision 301672)
@@ -1,29 +1,27 @@
 # $FreeBSD$
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
 CONTRIB= ${.CURDIR}/../../../../contrib/bsnmp
 .PATH: ${CONTRIB}/snmp_mibII
 
 MOD=	mibII
 SRCS=	mibII.c mibII_begemot.c mibII_ifmib.c mibII_ifstack.c		\
 	mibII_interfaces.c mibII_ip.c mibII_ipaddr.c mibII_nettomedia.c	\
 	mibII_rcvaddr.c mibII_route.c mibII_tcp.c mibII_udp.c
 XSYM=	ipAddrTable ifTable ifRcvAddressEntry ifMIB ipMIB tcpMIB udpMIB	\
 	ipForward ifIndex linkDown linkUp
 MAN=	snmp_mibII.3
 
 CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd
 CFLAGS+= -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY -DHAVE_SYS_TREE_H
-# XXX Work around clang warning, until maintainer approves fix.
-NO_WERROR.clang=
 
 DEFS=	${MOD}_tree.def
 INCS=	snmp_${MOD}.h
 BMIBS=	BEGEMOT-IP-MIB.txt BEGEMOT-MIB2-MIB.txt
 
 .include <bsd.snmpmod.mk>
 
 smilint:
 	env SMIPATH=/usr/share/snmp/mibs:/usr/local/share/snmp/mibs \
 	    smilint -c /dev/null -l6 -i group-membership ${BMIBS:C/^/${CONTRIB}\/snmp_mibII\//}
Index: stable/9/usr.sbin/bsnmpd
===================================================================
--- stable/9/usr.sbin/bsnmpd	(revision 301671)
+++ stable/9/usr.sbin/bsnmpd	(revision 301672)

Property changes on: stable/9/usr.sbin/bsnmpd
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /stable/10/usr.sbin/bsnmpd:r301671
Index: stable/9/usr.sbin
===================================================================
--- stable/9/usr.sbin	(revision 301671)
+++ stable/9/usr.sbin	(revision 301672)

Property changes on: stable/9/usr.sbin
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /stable/10/usr.sbin:r301671
Index: stable/9
===================================================================
--- stable/9	(revision 301671)
+++ stable/9	(revision 301672)

Property changes on: stable/9
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,2 ##
   Merged /head:r299815
   Merged /stable/10:r301671