svn commit: r311476 - in projects/bsnmp-ipv6-mib: contrib/bsnmp/lib contrib/bsnmp/snmp_mibII contrib/bsnmp/snmp_usm contrib/bsnmp/snmpd contrib/netbsd-tests/fs/tmpfs contrib/netbsd-tests/lib/libc/s...

Fri Jan 6 06:08:30 UTC 2017

Author: ngie
Date: Fri Jan  6 06:08:26 2017
New Revision: 311476
URL: https://svnweb.freebsd.org/changeset/base/311476

Log:
  MFhead at r311475

Added:
     - copied from r311475, head/contrib/zlib/
  projects/bsnmp-ipv6-mib/sys/boot/fdt/dts/arm/armada-385-db-ap.dts
     - copied unchanged from r311475, head/sys/boot/fdt/dts/arm/armada-385-db-ap.dts
  projects/bsnmp-ipv6-mib/sys/boot/fdt/dts/arm/armada-388-clearfog.dts
     - copied unchanged from r311475, head/sys/boot/fdt/dts/arm/armada-388-clearfog.dts
  projects/bsnmp-ipv6-mib/sys/boot/fdt/dts/arm/armada-38x-solidrun-microsom.dtsi
     - copied unchanged from r311475, head/sys/boot/fdt/dts/arm/armada-38x-solidrun-microsom.dtsi
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/os_specific/service_layers/osgendbg.c
     - copied unchanged from r311475, head/sys/contrib/dev/acpica/os_specific/service_layers/osgendbg.c
Directory Properties:
  projects/bsnmp-ipv6-mib/contrib/zlib/   (props changed)
Deleted:
  projects/bsnmp-ipv6-mib/lib/libz/ChangeLog
  projects/bsnmp-ipv6-mib/lib/libz/FAQ
  projects/bsnmp-ipv6-mib/lib/libz/README
  projects/bsnmp-ipv6-mib/lib/libz/adler32.c
  projects/bsnmp-ipv6-mib/lib/libz/compress.c
  projects/bsnmp-ipv6-mib/lib/libz/contrib/
  projects/bsnmp-ipv6-mib/lib/libz/crc32.c
  projects/bsnmp-ipv6-mib/lib/libz/crc32.h
  projects/bsnmp-ipv6-mib/lib/libz/deflate.c
  projects/bsnmp-ipv6-mib/lib/libz/deflate.h
  projects/bsnmp-ipv6-mib/lib/libz/doc/
  projects/bsnmp-ipv6-mib/lib/libz/gzclose.c
  projects/bsnmp-ipv6-mib/lib/libz/gzguts.h
  projects/bsnmp-ipv6-mib/lib/libz/gzlib.c
  projects/bsnmp-ipv6-mib/lib/libz/gzread.c
  projects/bsnmp-ipv6-mib/lib/libz/gzwrite.c
  projects/bsnmp-ipv6-mib/lib/libz/infback.c
  projects/bsnmp-ipv6-mib/lib/libz/inffast.c
  projects/bsnmp-ipv6-mib/lib/libz/inffast.h
  projects/bsnmp-ipv6-mib/lib/libz/inffixed.h
  projects/bsnmp-ipv6-mib/lib/libz/inflate.c
  projects/bsnmp-ipv6-mib/lib/libz/inflate.h
  projects/bsnmp-ipv6-mib/lib/libz/inftrees.c
  projects/bsnmp-ipv6-mib/lib/libz/inftrees.h
  projects/bsnmp-ipv6-mib/lib/libz/test/
  projects/bsnmp-ipv6-mib/lib/libz/trees.c
  projects/bsnmp-ipv6-mib/lib/libz/trees.h
  projects/bsnmp-ipv6-mib/lib/libz/uncompr.c
  projects/bsnmp-ipv6-mib/lib/libz/zconf.h
  projects/bsnmp-ipv6-mib/lib/libz/zlib.3
  projects/bsnmp-ipv6-mib/lib/libz/zlib.h
  projects/bsnmp-ipv6-mib/lib/libz/zutil.c
  projects/bsnmp-ipv6-mib/lib/libz/zutil.h
Modified:
  projects/bsnmp-ipv6-mib/contrib/bsnmp/lib/snmpclient.c
  projects/bsnmp-ipv6-mib/contrib/bsnmp/snmp_mibII/snmp_mibII.3
  projects/bsnmp-ipv6-mib/contrib/bsnmp/snmp_usm/usm_snmp.c
  projects/bsnmp-ipv6-mib/contrib/bsnmp/snmpd/main.c
  projects/bsnmp-ipv6-mib/contrib/bsnmp/snmpd/trans_lsock.c
  projects/bsnmp-ipv6-mib/contrib/netbsd-tests/fs/tmpfs/h_tools.c
  projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_pipe.c
  projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_revoke.c
  projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_select.c
  projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c
  projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_stat.c
  projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libpthread/t_condwait.c
  projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libpthread/t_fpu.c
  projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c
  projects/bsnmp-ipv6-mib/contrib/tcp_wrappers/scaffold.c
  projects/bsnmp-ipv6-mib/contrib/tcp_wrappers/tcpd.h
  projects/bsnmp-ipv6-mib/etc/mtree/BSD.tests.dist
  projects/bsnmp-ipv6-mib/etc/mtree/BSD.var.dist
  projects/bsnmp-ipv6-mib/lib/libc/x86/sys/__vdso_gettc.c
  projects/bsnmp-ipv6-mib/lib/libproc/proc_sym.c
  projects/bsnmp-ipv6-mib/lib/libstand/Makefile
  projects/bsnmp-ipv6-mib/lib/libz/FREEBSD-upgrade
  projects/bsnmp-ipv6-mib/lib/libz/Makefile
  projects/bsnmp-ipv6-mib/lib/libz/Symbol.map
  projects/bsnmp-ipv6-mib/lib/libz/Versions.def
  projects/bsnmp-ipv6-mib/lib/libz/zlib.pc
  projects/bsnmp-ipv6-mib/libexec/tftpd/Makefile
  projects/bsnmp-ipv6-mib/libexec/tftpd/tftpd.c
  projects/bsnmp-ipv6-mib/sbin/dhclient/dispatch.c
  projects/bsnmp-ipv6-mib/sys/arm/conf/ARMADA38X
  projects/bsnmp-ipv6-mib/sys/boot/fdt/dts/arm/armada-38x.dtsi
  projects/bsnmp-ipv6-mib/sys/boot/mips/beri/boot2/Makefile
  projects/bsnmp-ipv6-mib/sys/boot/mips/beri/common/common.ldscript
  projects/bsnmp-ipv6-mib/sys/boot/mips/beri/loader/loader.ldscript
  projects/bsnmp-ipv6-mib/sys/cam/cam_xpt.c
  projects/bsnmp-ipv6-mib/sys/cam/ctl/ctl_frontend_cam_sim.c
  projects/bsnmp-ipv6-mib/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/bsnmp-ipv6-mib/sys/cam/ctl/ctl_ha.c
  projects/bsnmp-ipv6-mib/sys/cam/scsi/scsi_low.c
  projects/bsnmp-ipv6-mib/sys/compat/freebsd32/freebsd32_misc.c
  projects/bsnmp-ipv6-mib/sys/compat/linux/linux_socket.c
  projects/bsnmp-ipv6-mib/sys/compat/linux/linux_stats.c
  projects/bsnmp-ipv6-mib/sys/compat/svr4/svr4_misc.c
  projects/bsnmp-ipv6-mib/sys/conf/files
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/acpica_prep.sh
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/changes.txt
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/common/acfileio.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/common/ahtable.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/common/ahuuids.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/components/debugger/dbinput.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/components/debugger/dbxface.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/components/executer/exconfig.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/components/executer/exfldio.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/components/hardware/hwesleep.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/components/hardware/hwregs.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/components/hardware/hwsleep.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/components/parser/psargs.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/components/parser/pstree.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/components/utilities/utdecode.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/components/utilities/utdelete.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/components/utilities/utmutex.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/components/utilities/utresrc.c
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/include/acclib.h
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/include/acdebug.h
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/include/acdisasm.h
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/include/acexcep.h
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/include/acglobal.h
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/include/aclocal.h
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/include/acmacros.h
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/include/acpiosxf.h
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/include/acpixf.h
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/include/platform/acenv.h
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
  projects/bsnmp-ipv6-mib/sys/dev/aac/aac_cam.c
  projects/bsnmp-ipv6-mib/sys/dev/aacraid/aacraid_cam.c
  projects/bsnmp-ipv6-mib/sys/dev/acpica/Osd/OsdDebug.c
  projects/bsnmp-ipv6-mib/sys/dev/acpica/Osd/OsdHardware.c
  projects/bsnmp-ipv6-mib/sys/dev/advansys/advansys.c
  projects/bsnmp-ipv6-mib/sys/dev/advansys/adwcam.c
  projects/bsnmp-ipv6-mib/sys/dev/agp/agp_i810.c
  projects/bsnmp-ipv6-mib/sys/dev/aha/aha.c
  projects/bsnmp-ipv6-mib/sys/dev/ahb/ahb.c
  projects/bsnmp-ipv6-mib/sys/dev/ahci/ahci.c
  projects/bsnmp-ipv6-mib/sys/dev/ahci/ahciem.c
  projects/bsnmp-ipv6-mib/sys/dev/aic/aic.c
  projects/bsnmp-ipv6-mib/sys/dev/aic7xxx/aic79xx_osm.c
  projects/bsnmp-ipv6-mib/sys/dev/aic7xxx/aic7xxx_osm.c
  projects/bsnmp-ipv6-mib/sys/dev/amr/amr_cam.c
  projects/bsnmp-ipv6-mib/sys/dev/arcmsr/arcmsr.c
  projects/bsnmp-ipv6-mib/sys/dev/ata/ata-all.c
  projects/bsnmp-ipv6-mib/sys/dev/ath/ath_hal/ah_regdomain.c
  projects/bsnmp-ipv6-mib/sys/dev/buslogic/bt.c
  projects/bsnmp-ipv6-mib/sys/dev/ciss/ciss.c
  projects/bsnmp-ipv6-mib/sys/dev/dpt/dpt_scsi.c
  projects/bsnmp-ipv6-mib/sys/dev/esp/ncr53c9x.c
  projects/bsnmp-ipv6-mib/sys/dev/etherswitch/e6000sw/e6000sw.c
  projects/bsnmp-ipv6-mib/sys/dev/etherswitch/e6000sw/e6000swreg.h
  projects/bsnmp-ipv6-mib/sys/dev/firewire/sbp.c
  projects/bsnmp-ipv6-mib/sys/dev/firewire/sbp_targ.c
  projects/bsnmp-ipv6-mib/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
  projects/bsnmp-ipv6-mib/sys/dev/hptiop/hptiop.c
  projects/bsnmp-ipv6-mib/sys/dev/hptmv/entry.c
  projects/bsnmp-ipv6-mib/sys/dev/hptnr/hptnr_osm_bsd.c
  projects/bsnmp-ipv6-mib/sys/dev/hptrr/hptrr_osm_bsd.c
  projects/bsnmp-ipv6-mib/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
  projects/bsnmp-ipv6-mib/sys/dev/iir/iir.c
  projects/bsnmp-ipv6-mib/sys/dev/isci/isci_controller.c
  projects/bsnmp-ipv6-mib/sys/dev/iscsi_initiator/isc_cam.c
  projects/bsnmp-ipv6-mib/sys/dev/isp/isp_freebsd.c
  projects/bsnmp-ipv6-mib/sys/dev/mfi/mfi_cam.c
  projects/bsnmp-ipv6-mib/sys/dev/mly/mly.c
  projects/bsnmp-ipv6-mib/sys/dev/mpr/mpr_sas.c
  projects/bsnmp-ipv6-mib/sys/dev/mps/mps_sas.c
  projects/bsnmp-ipv6-mib/sys/dev/mpt/mpt_cam.c
  projects/bsnmp-ipv6-mib/sys/dev/mrsas/mrsas_cam.c
  projects/bsnmp-ipv6-mib/sys/dev/mvs/mvs.c
  projects/bsnmp-ipv6-mib/sys/dev/ncr/ncr.c
  projects/bsnmp-ipv6-mib/sys/dev/nvme/nvme_sim.c
  projects/bsnmp-ipv6-mib/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
  projects/bsnmp-ipv6-mib/sys/dev/ppbus/vpo.c
  projects/bsnmp-ipv6-mib/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c
  projects/bsnmp-ipv6-mib/sys/dev/rtwn/rtl8192c/r92c_init.c
  projects/bsnmp-ipv6-mib/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c
  projects/bsnmp-ipv6-mib/sys/dev/siis/siis.c
  projects/bsnmp-ipv6-mib/sys/dev/sym/sym_hipd.c
  projects/bsnmp-ipv6-mib/sys/dev/trm/trm.c
  projects/bsnmp-ipv6-mib/sys/dev/twa/tw_osl_cam.c
  projects/bsnmp-ipv6-mib/sys/dev/tws/tws_cam.c
  projects/bsnmp-ipv6-mib/sys/dev/virtio/scsi/virtio_scsi.c
  projects/bsnmp-ipv6-mib/sys/fs/nfs/nfs_commonsubs.c
  projects/bsnmp-ipv6-mib/sys/fs/nfsserver/nfs_nfsdserv.c
  projects/bsnmp-ipv6-mib/sys/fs/nullfs/null_vfsops.c
  projects/bsnmp-ipv6-mib/sys/fs/unionfs/union_vfsops.c
  projects/bsnmp-ipv6-mib/sys/i386/ibcs2/ibcs2_stat.c
  projects/bsnmp-ipv6-mib/sys/kern/kern_acct.c
  projects/bsnmp-ipv6-mib/sys/kern/kern_exec.c
  projects/bsnmp-ipv6-mib/sys/kern/kern_sendfile.c
  projects/bsnmp-ipv6-mib/sys/kern/vfs_bio.c
  projects/bsnmp-ipv6-mib/sys/kern/vfs_cluster.c
  projects/bsnmp-ipv6-mib/sys/kern/vfs_default.c
  projects/bsnmp-ipv6-mib/sys/kern/vfs_lookup.c
  projects/bsnmp-ipv6-mib/sys/kern/vfs_mount.c
  projects/bsnmp-ipv6-mib/sys/kern/vfs_syscalls.c
  projects/bsnmp-ipv6-mib/sys/mips/conf/JZ4780
  projects/bsnmp-ipv6-mib/sys/mips/include/db_machdep.h
  projects/bsnmp-ipv6-mib/sys/mips/ingenic/jz4780_mpboot.S
  projects/bsnmp-ipv6-mib/sys/mips/mips/db_trace.c
  projects/bsnmp-ipv6-mib/sys/mips/mips/trap.c
  projects/bsnmp-ipv6-mib/sys/net/if.c
  projects/bsnmp-ipv6-mib/sys/net/if_media.h
  projects/bsnmp-ipv6-mib/sys/net80211/_ieee80211.h
  projects/bsnmp-ipv6-mib/sys/net80211/ieee80211_var.h
  projects/bsnmp-ipv6-mib/sys/netinet/tcp_hostcache.c
  projects/bsnmp-ipv6-mib/sys/powerpc/ps3/ps3cdrom.c
  projects/bsnmp-ipv6-mib/sys/powerpc/pseries/phyp_vscsi.c
  projects/bsnmp-ipv6-mib/sys/sys/imgact.h
  projects/bsnmp-ipv6-mib/sys/sys/mount.h
  projects/bsnmp-ipv6-mib/sys/vm/vm_init.c
  projects/bsnmp-ipv6-mib/sys/vm/vm_kern.c
  projects/bsnmp-ipv6-mib/sys/vm/vm_kern.h
  projects/bsnmp-ipv6-mib/sys/vm/vm_page.c
  projects/bsnmp-ipv6-mib/sys/vm/vm_page.h
  projects/bsnmp-ipv6-mib/sys/vm/vm_pager.c
  projects/bsnmp-ipv6-mib/sys/vm/vnode_pager.c
  projects/bsnmp-ipv6-mib/tools/build/mk/OptionalObsoleteFiles.inc
  projects/bsnmp-ipv6-mib/usr.bin/chat/chat.c
  projects/bsnmp-ipv6-mib/usr.bin/minigzip/Makefile
  projects/bsnmp-ipv6-mib/usr.bin/netstat/if.c
  projects/bsnmp-ipv6-mib/usr.bin/netstat/inet.c
  projects/bsnmp-ipv6-mib/usr.bin/netstat/inet6.c
  projects/bsnmp-ipv6-mib/usr.bin/netstat/mroute.c
  projects/bsnmp-ipv6-mib/usr.bin/netstat/netstat.h
  projects/bsnmp-ipv6-mib/usr.bin/netstat/route.c
  projects/bsnmp-ipv6-mib/usr.bin/netstat/sctp.c
  projects/bsnmp-ipv6-mib/usr.bin/netstat/unix.c
  projects/bsnmp-ipv6-mib/usr.bin/rpcgen/rpc_parse.c
  projects/bsnmp-ipv6-mib/usr.bin/tail/reverse.c
  projects/bsnmp-ipv6-mib/usr.sbin/acpi/acpidb/Makefile
  projects/bsnmp-ipv6-mib/usr.sbin/acpi/acpidb/acpidb.c
  projects/bsnmp-ipv6-mib/usr.sbin/amd/amd/Makefile
  projects/bsnmp-ipv6-mib/usr.sbin/amd/include/config.h
  projects/bsnmp-ipv6-mib/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
  projects/bsnmp-ipv6-mib/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c
  projects/bsnmp-ipv6-mib/usr.sbin/inetd/inetd.c
  projects/bsnmp-ipv6-mib/usr.sbin/rpcbind/Makefile
  projects/bsnmp-ipv6-mib/usr.sbin/sendmail/Makefile
  projects/bsnmp-ipv6-mib/usr.sbin/ypserv/Makefile
Directory Properties:
  projects/bsnmp-ipv6-mib/   (props changed)
  projects/bsnmp-ipv6-mib/contrib/netbsd-tests/   (props changed)
  projects/bsnmp-ipv6-mib/sys/contrib/dev/acpica/   (props changed)

Modified: projects/bsnmp-ipv6-mib/contrib/bsnmp/lib/snmpclient.c
==============================================================================

--- projects/bsnmp-ipv6-mib/contrib/bsnmp/lib/snmpclient.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/contrib/bsnmp/lib/snmpclient.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -728,8 +728,11 @@ snmp_table_fetch_async(const struct snmp
 	work->last_change = 0;
 	table_init_pdu(descr, &work->pdu);
 
-	if (snmp_pdu_send(&work->pdu, table_cb, work) == -1)
+	if (snmp_pdu_send(&work->pdu, table_cb, work) == -1) {
+		free(work);
+		work = NULL;
 		return (-1);
+	}
 	return (0);
 }
 
@@ -1231,7 +1234,7 @@ snmp_send_packet(struct snmp_pdu * pdu)
 	struct asn_buf b;
 	ssize_t ret;
 
-	if ((buf = malloc(snmp_client.txbuflen)) == NULL) {
+	if ((buf = calloc(1, snmp_client.txbuflen)) == NULL) {
 		seterr(&snmp_client, "%s", strerror(errno));
 		return (-1);
 	}
@@ -1256,7 +1259,7 @@ snmp_send_packet(struct snmp_pdu * pdu)
 	}
 	free(buf);
 
-	return pdu->request_id;
+	return (pdu->request_id);
 }
 
 /*
@@ -1352,7 +1355,7 @@ snmp_receive_packet(struct snmp_pdu *pdu
 	socklen_t optlen;
 #endif
 
-	if ((buf = malloc(snmp_client.rxbuflen)) == NULL) {
+	if ((buf = calloc(1, snmp_client.rxbuflen)) == NULL) {
 		seterr(&snmp_client, "%s", strerror(errno));
 		return (-1);
 	}

Modified: projects/bsnmp-ipv6-mib/contrib/bsnmp/snmp_mibII/snmp_mibII.3
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/bsnmp/snmp_mibII/snmp_mibII.3	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/contrib/bsnmp/snmp_mibII/snmp_mibII.3	Fri Jan  6 06:08:26 2017	(r311476)
@@ -31,7 +31,7 @@
 .\"
 .\" $Begemot: bsnmp/snmp_mibII/snmp_mibII.3,v 1.10 2005/10/04 08:46:52 brandt_h Exp $
 .\"
-.Dd October 4, 2005
+.Dd January 4, 2017
 .Dt SNMP_MIBII 3
 .Os
 .Sh NAME
@@ -63,6 +63,8 @@
 .Sh LIBRARY
 .Pq begemotSnmpdModulePath."mibII" = "@MODPATH at snmp_mibII.so"
 .Sh SYNOPSIS
+.In net/if.h
+.In net/if_mib.h
 .In bsnmp/snmpmod.h
 .In bsnmp/snmp_mibII.h
 .Ft typedef void

Modified: projects/bsnmp-ipv6-mib/contrib/bsnmp/snmp_usm/usm_snmp.c
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/bsnmp/snmp_usm/usm_snmp.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/contrib/bsnmp/snmp_usm/usm_snmp.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -167,10 +167,14 @@ op_usm_users(struct snmp_context *ctx, s
 		if ((uuser = usm_get_user(&val->var, sub)) == NULL &&
 		    val->var.subs[sub - 1] != LEAF_usmUserStatus &&
 		    val->var.subs[sub - 1] != LEAF_usmUserCloneFrom)
-				return (SNMP_ERR_NOSUCHNAME);
+			return (SNMP_ERR_NOSUCHNAME);
 
+		/*
+		 * XXX (ngie): need to investigate the MIB to determine how
+		 * this is possible given some of the transitions below.
+		 */
 		if (community != COMM_INITIALIZE &&
-		    uuser->type == StorageType_readOnly)
+		    uuser != NULL && uuser->type == StorageType_readOnly)
 			return (SNMP_ERR_NOT_WRITEABLE);
 
 		switch (val->var.subs[sub - 1]) {

Modified: projects/bsnmp-ipv6-mib/contrib/bsnmp/snmpd/main.c
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/bsnmp/snmpd/main.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/contrib/bsnmp/snmpd/main.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -2324,13 +2324,12 @@ lm_load(const char *path, const char *se
 	}
 	m->handle = NULL;
 	m->flags = 0;
-	strcpy(m->section, section);
+	strlcpy(m->section, section, sizeof(m->section));
 
-	if ((m->path = malloc(strlen(path) + 1)) == NULL) {
+	if ((m->path = strdup(path)) == NULL) {
 		syslog(LOG_ERR, "lm_load: %m");
 		goto err;
 	}
-	strcpy(m->path, path);
 
 	/*
 	 * Make index

Modified: projects/bsnmp-ipv6-mib/contrib/bsnmp/snmpd/trans_lsock.c
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/bsnmp/snmpd/trans_lsock.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/contrib/bsnmp/snmpd/trans_lsock.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -146,16 +146,14 @@ lsock_open_port(u_char *name, size_t nam
 		return (SNMP_ERR_BADVALUE);
 	}
 
-	if ((port = malloc(sizeof(*port))) == NULL)
+	if ((port = calloc(1, sizeof(*port))) == NULL)
 		return (SNMP_ERR_GENERR);
 
-	memset(port, 0, sizeof(*port));
 	if (!is_stream) {
-		if ((peer = malloc(sizeof(*peer))) == NULL) {
+		if ((peer = calloc(1, sizeof(*peer))) == NULL) {
 			free(port);
 			return (SNMP_ERR_GENERR);
 		}
-		memset(peer, 0, sizeof(*peer));
 	}
 	if ((port->name = malloc(namelen + 1)) == NULL) {
 		free(port);
@@ -261,12 +259,11 @@ lsock_listen_input(int fd, void *udata)
 	struct lsock_port *p = udata;
 	struct lsock_peer *peer;
 
-	if ((peer = malloc(sizeof(*peer))) == NULL) {
+	if ((peer = calloc(1, sizeof(*peer))) == NULL) {
 		syslog(LOG_WARNING, "%s: peer malloc failed", p->name);
 		(void)close(accept(fd, NULL, NULL));
 		return;
 	}
-	memset(peer, 0, sizeof(*peer));
 
 	peer->port = p;
 
@@ -308,10 +305,9 @@ lsock_init_port(struct tport *tp)
 			return (SNMP_ERR_RES_UNAVAIL);
 		}
 
-		strcpy(sa.sun_path, p->name);
+		strlcpy(sa.sun_path, p->name, sizeof(sa.sun_path));
 		sa.sun_family = AF_LOCAL;
-		sa.sun_len = strlen(p->name) +
-		    offsetof(struct sockaddr_un, sun_path);
+		sa.sun_len = SUN_LEN(&sa);
 
 		(void)remove(p->name);
 
@@ -363,10 +359,9 @@ lsock_init_port(struct tport *tp)
 			return (SNMP_ERR_GENERR);
 		}
 
-		strcpy(sa.sun_path, p->name);
+		strlcpy(sa.sun_path, p->name, sizeof(sa.sun_path));
 		sa.sun_family = AF_LOCAL;
-		sa.sun_len = strlen(p->name) +
-		    offsetof(struct sockaddr_un, sun_path);
+		sa.sun_len = SUN_LEN(&sa);
 
 		(void)remove(p->name);
 

Modified: projects/bsnmp-ipv6-mib/contrib/netbsd-tests/fs/tmpfs/h_tools.c
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/netbsd-tests/fs/tmpfs/h_tools.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/contrib/netbsd-tests/fs/tmpfs/h_tools.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -244,13 +244,15 @@ sockets_main(int argc, char **argv)
 	}
 
 #ifdef	__FreeBSD__
-	addr.sun_len = sizeof(addr.sun_path);
-	(void)strlcpy(addr.sun_path, argv[1], addr.sun_len);
-#else
-	(void)strlcpy(addr.sun_path, argv[1], sizeof(addr.sun_path));
+	memset(&addr, 0, sizeof(addr));
 #endif
+	(void)strlcpy(addr.sun_path, argv[1], sizeof(addr.sun_path));
 	addr.sun_family = PF_UNIX;
+#ifdef	__FreeBSD__
+	error = bind(fd, (struct sockaddr *)&addr, SUN_LEN(&addr));
+#else
 	error = bind(fd, (struct sockaddr *)&addr, sizeof(addr));
+#endif
 	if (error == -1) {
 		warn("connect");
 #ifdef	__FreeBSD__

Modified: projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_pipe.c
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_pipe.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_pipe.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -153,6 +153,9 @@ ATF_TC_BODY(pipe_restart, tc)
 
 		ATF_REQUIRE_EQ(WEXITSTATUS(st), 0);
 	}
+#ifdef	__FreeBSD__
+	free(f);
+#endif
 }
 
 ATF_TP_ADD_TCS(tp)

Modified: projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_revoke.c
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_revoke.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_revoke.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -176,6 +176,9 @@ ATF_TC_BODY(revoke_perm, tc)
 	if (WIFEXITED(sta) == 0 || WEXITSTATUS(sta) != EXIT_SUCCESS)
 		atf_tc_fail("revoke(2) did not obey permissions");
 
+#ifdef	__FreeBSD__
+	(void)close(fd);
+#endif
 	ATF_REQUIRE(unlink(path) == 0);
 }
 

Modified: projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_select.c
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_select.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_select.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -135,6 +135,9 @@ child(const struct timespec *ts)
 		    "after timeout %s != %s",
 		    prmask(&nset, nbuf, sizeof(nbuf)),
 		    prmask(&oset, obuf, sizeof(obuf)));
+#ifdef	__FreeBSD__
+	_exit(0);
+#endif
 }
 
 ATF_TC(pselect_sigmask);
@@ -154,6 +157,9 @@ ATF_TC_BODY(pselect_sigmask, tc)
 	switch (pid = fork()) {
 	case 0:
 		child(NULL);
+#ifdef	__FreeBSD__
+		break;
+#endif
 	case -1:
 		err(1, "fork");
 	default:

Modified: projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -129,6 +129,9 @@ out:
 
 	if (lim != 0)
 		atf_tc_fail("failed to set limit (%d)", lim);
+#ifdef	__FreeBSD__
+	free(buf);
+#endif
 }
 
 ATF_TC(setrlimit_current);

Modified: projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_stat.c
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_stat.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libc/sys/t_stat.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -398,6 +398,9 @@ ATF_TC_BODY(stat_symlink, tc)
 
 	ATF_REQUIRE(unlink(path) == 0);
 	ATF_REQUIRE(unlink(pathlink) == 0);
+#ifdef	__FreeBSD__
+	(void)close(fd);
+#endif
 }
 
 ATF_TC_CLEANUP(stat_symlink, tc)

Modified: projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libpthread/t_condwait.c
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libpthread/t_condwait.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libpthread/t_condwait.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -42,6 +42,8 @@ __RCSID("$NetBSD: t_condwait.c,v 1.4 201
 
 #ifdef __FreeBSD__
 #include <sys/time.h>
+
+#include "h_common.h"
 #endif
 
 #define WAITTIME 2	/* Timeout wait secound */
@@ -60,8 +62,13 @@ run(void *param)
 
 
 	clck = *(clockid_t *)param;
+#ifdef	__FreeBSD__
+	PTHREAD_REQUIRE(pthread_condattr_init(&attr));
+	PTHREAD_REQUIRE(pthread_condattr_setclock(&attr, clck));
+#else
 	pthread_condattr_init(&attr);
 	pthread_condattr_setclock(&attr, clck); /* MONOTONIC or MONOTONIC */
+#endif
 	pthread_cond_init(&cond, &attr);
 
 	ATF_REQUIRE_EQ((ret = pthread_mutex_lock(&m)), 0);

Modified: projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libpthread/t_fpu.c
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libpthread/t_fpu.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libpthread/t_fpu.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -58,6 +58,11 @@ __RCSID("$NetBSD: t_fpu.c,v 1.2 2013/01/
 
 #include <atf-c.h>
 
+#ifdef	__FreeBSD__
+#include <errno.h>
+#include <string.h>
+#endif
+
 #include "h_common.h"
 
 #define N_RECURSE 10
@@ -77,14 +82,24 @@ stir(void *p)
 
 	for (;;) {
 		x = sin ((y = cos (x + y + .4)) - (z = cos (x + z + .6)));
+#ifdef	__FreeBSD__
+		ATF_REQUIRE_MSG(sched_yield() == 0,
+		    "sched_yield failed: %s", strerror(errno));
+#else
 		PTHREAD_REQUIRE(sched_yield());
+#endif
 	}
 }
 
 static double
 mul3(double x, double y, double z)
 {
+#ifdef	__FreeBSD__
+	ATF_REQUIRE_MSG(sched_yield() == 0,
+	    "sched_yield failed: %s", strerror(errno));
+#else
 	PTHREAD_REQUIRE(sched_yield());
+#endif
 
 	return x * y * z;
 }
@@ -114,7 +129,11 @@ bar(void *p)
 static void
 recurse(void) {
 	pthread_t s2;
+#ifdef	__FreeBSD__
+	PTHREAD_REQUIRE(pthread_create(&s2, 0, bar, 0));
+#else
 	pthread_create(&s2, 0, bar, 0);
+#endif
 	sleep(20); /* XXX must be long enough for our slowest machine */
 }
 
@@ -134,7 +153,11 @@ ATF_TC_BODY(fpu, tc)
 
 	PTHREAD_REQUIRE(pthread_mutex_init(&recursion_depth_lock, 0));
 
+#ifdef	__FreeBSD__
+	PTHREAD_REQUIRE(pthread_create(&s5, 0, stir, stirseed));
+#else
 	pthread_create(&s5, 0, stir, stirseed);
+#endif
 	recurse();
 
 	atf_tc_fail("exiting from main");

Modified: projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -30,6 +30,8 @@ __RCSID("$NetBSD");
 
 #ifdef __FreeBSD__
 #include <sys/types.h>
+#include <errno.h>
+#include <string.h>
 #endif
 #include <pthread.h>
 #include <ucontext.h>
@@ -80,7 +82,12 @@ threadfunc(void *arg)
        
 	oself = (void *)pthread_self();
 	printf("before swapcontext self = %p\n", oself);
+#ifdef	__FreeBSD__
+	ATF_REQUIRE_MSG(swapcontext(&octx, &nctx) != -1, "swapcontext failed: %s",
+	    strerror(errno));
+#else
 	PTHREAD_REQUIRE(swapcontext(&octx, &nctx));
+#endif
 
 	/* NOTREACHED */
 	return NULL;
@@ -111,7 +118,12 @@ ATF_TC_BODY(swapcontext1, tc)
 
 	printf("Testing if swapcontext() alters pthread_self()\n");
 
+#ifdef	__FreeBSD__
+	ATF_REQUIRE_MSG(getcontext(&nctx) != -1, "getcontext failed: %s",
+	    strerror(errno));
+#else
 	PTHREAD_REQUIRE(getcontext(&nctx));
+#endif
 	PTHREAD_REQUIRE(pthread_create(&thread, NULL, threadfunc, NULL));
 	PTHREAD_REQUIRE(pthread_join(thread, NULL));
 }

Modified: projects/bsnmp-ipv6-mib/contrib/tcp_wrappers/scaffold.c
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/tcp_wrappers/scaffold.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/contrib/tcp_wrappers/scaffold.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -235,16 +235,6 @@ struct request_info *request;
     exit(0);
 }
 
-/* dummy function  to intercept the real rfc931() */
-
-/* ARGSUSED */
-
-void    rfc931(request)
-struct request_info *request;
-{
-    strcpy(request->user, unknown);
-}
-
 /* check_path - examine accessibility */
 
 int     check_path(path, st)

Modified: projects/bsnmp-ipv6-mib/contrib/tcp_wrappers/tcpd.h
==============================================================================
--- projects/bsnmp-ipv6-mib/contrib/tcp_wrappers/tcpd.h	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/contrib/tcp_wrappers/tcpd.h	Fri Jan  6 06:08:26 2017	(r311476)
@@ -6,6 +6,12 @@
   * $FreeBSD$
   */
 
+#ifdef INET6
+#define	TCPD_SOCKADDR struct sockaddr
+#else
+#define	TCPD_SOCKADDR struct sockaddr_in
+#endif
+
 /* Structure to describe one communications endpoint. */
 
 #define	STRING_LENGTH	128		/* hosts, users, processes */
@@ -13,11 +19,7 @@
 struct host_info {
     char    name[STRING_LENGTH];	/* access via eval_hostname(host) */
     char    addr[STRING_LENGTH];	/* access via eval_hostaddr(host) */
-#ifdef INET6
-    struct sockaddr *sin;		/* socket address or 0 */
-#else
-    struct sockaddr_in *sin;		/* socket address or 0 */
-#endif
+    TCPD_SOCKADDR *sin;			/* socket address or 0 */
     struct t_unitdata *unit;		/* TLI transport address or 0 */
     struct request_info *request;	/* for shared information */
 };
@@ -67,21 +69,22 @@ extern char paranoid[];
 /* Global functions. */
 
 #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
-extern void fromhost();			/* get/validate client host info */
+void fromhost(struct request_info *);	/* get/validate client host info */
 #else
 #define	fromhost sock_host		/* no TLI support needed */
 #endif
 
-extern int hosts_access();		/* access control */
-extern int hosts_ctl();			/* wrapper around request_init() */
-extern void shell_cmd();		/* execute shell command */
-extern char *percent_x();		/* do %<char> expansion */
-extern void rfc931();			/* client name from RFC 931 daemon */
-extern void clean_exit();		/* clean up and exit */
-extern void refuse();			/* clean up and exit */
-extern char *xgets();			/* fgets() on steroids */
-extern char *split_at();		/* strchr() and split */
-extern unsigned long dot_quad_addr();	/* restricted inet_addr() */
+int hosts_access(struct request_info *);			/* access control */
+int hosts_ctl(char *, char *, char *, char *);			/* wrapper around request_init() */
+void shell_cmd(char *);						/* execute shell command */
+char *percent_x(char *, int, char *, struct request_info *);	/* do %<char> expansion */
+void rfc931(TCPD_SOCKADDR *, TCPD_SOCKADDR *, char *);		/* client name from RFC 931 daemon */
+void clean_exit(struct request_info *);				/* clean up and exit */
+void refuse(struct request_info *);				/* clean up and exit */
+char *xgets(char *, int, FILE *);				/* fgets() on steroids */
+
+char *split_at(char *, int);					/* strchr() and split */
+unsigned long dot_quad_addr(char *);				/* restricted inet_addr() */
 
 /* Global variables. */
 
@@ -98,13 +101,8 @@ extern int resident;			/* > 0 if residen
   * attributes. Each attribute has its own key.
   */
 
-#ifdef __STDC__
-extern struct request_info *request_init(struct request_info *,...);
-extern struct request_info *request_set(struct request_info *,...);
-#else
-extern struct request_info *request_init();	/* initialize request */
-extern struct request_info *request_set();	/* update request structure */
-#endif
+struct request_info *request_init(struct request_info *,...);	/* initialize request */
+struct request_info *request_set(struct request_info *,...);	/* update request structure */
 
 #define	RQ_FILE		1		/* file descriptor */
 #define	RQ_DAEMON	2		/* server process (argv[0]) */
@@ -124,27 +122,27 @@ extern struct request_info *request_set(
   * host_info structures serve as caches for the lookup results.
   */
 
-extern char *eval_user();		/* client user */
-extern char *eval_hostname();		/* printable hostname */
-extern char *eval_hostaddr();		/* printable host address */
-extern char *eval_hostinfo();		/* host name or address */
-extern char *eval_client();		/* whatever is available */
-extern char *eval_server();		/* whatever is available */
+char *eval_user(struct request_info *);		/* client user */
+char *eval_hostname(struct host_info *);	/* printable hostname */
+char *eval_hostaddr(struct host_info *);	/* printable host address */
+char *eval_hostinfo(struct host_info *);	/* host name or address */
+char *eval_client(struct request_info *);	/* whatever is available */
+char *eval_server(struct request_info *);	/* whatever is available */
 #define	eval_daemon(r)	((r)->daemon)	/* daemon process name */
 #define	eval_pid(r)	((r)->pid)	/* process id */
 
 /* Socket-specific methods, including DNS hostname lookups. */
 
-extern void sock_host();		/* look up endpoint addresses */
-extern void sock_hostname();		/* translate address to hostname */
-extern void sock_hostaddr();		/* address to printable address */
+void sock_host(struct request_info *);		/* look up endpoint addresses */
+void sock_hostname(struct host_info *);		/* translate address to hostname */
+void sock_hostaddr(struct host_info *);		/* address to printable address */
 #define	sock_methods(r) \
 	{ (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
 
 /* The System V Transport-Level Interface (TLI) interface. */
 
 #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
-extern void tli_host();			/* look up endpoint addresses etc. */
+void tli_host(struct request_info *);		/* look up endpoint addresses etc. */
 #endif
 
  /*
@@ -153,13 +151,8 @@ extern void tli_host();			/* look up end
   * everyone would have to include <setjmp.h>.
   */
 
-#ifdef __STDC__
-extern void tcpd_warn(char *, ...);	/* report problem and proceed */
-extern void tcpd_jump(char *, ...);	/* report problem and jump */
-#else
-extern void tcpd_warn();
-extern void tcpd_jump();
-#endif
+void tcpd_warn(char *, ...);		/* report problem and proceed */
+void tcpd_jump(char *, ...);		/* report problem and jump */
 
 struct tcpd_context {
     char   *file;			/* current file */
@@ -185,42 +178,42 @@ extern struct tcpd_context tcpd_context;
   * behavior.
   */
 
-extern void process_options();		/* execute options */
-extern int dry_run;			/* verification flag */
+void process_options(char *, struct request_info *);	/* execute options */
+extern int dry_run;					/* verification flag */
 
 /* Bug workarounds. */
 
 #ifdef INET_ADDR_BUG			/* inet_addr() returns struct */
 #define	inet_addr fix_inet_addr
-extern long fix_inet_addr();
+long fix_inet_addr(char *);
 #endif
 
 #ifdef BROKEN_FGETS			/* partial reads from sockets */
 #define	fgets fix_fgets
-extern char *fix_fgets();
+char *fix_fgets(char *, int, FILE *);
 #endif
 
 #ifdef RECVFROM_BUG			/* no address family info */
 #define	recvfrom fix_recvfrom
-extern int fix_recvfrom();
+int fix_recvfrom(int, char *, int, int, struct sockaddr *, int *);
 #endif
 
 #ifdef GETPEERNAME_BUG			/* claims success with UDP */
 #define	getpeername fix_getpeername
-extern int fix_getpeername();
+int fix_getpeername(int, struct sockaddr *, int *);
 #endif
 
 #ifdef SOLARIS_24_GETHOSTBYNAME_BUG	/* lists addresses as aliases */
 #define	gethostbyname fix_gethostbyname
-extern struct hostent *fix_gethostbyname();
+struct hostent *fix_gethostbyname(char *);
 #endif
 
 #ifdef USE_STRSEP			/* libc calls strtok() */
 #define	strtok	fix_strtok
-extern char *fix_strtok();
+char *fix_strtok(char *, char *);
 #endif
 
 #ifdef LIBC_CALLS_STRTOK		/* libc calls strtok() */
 #define	strtok	my_strtok
-extern char *my_strtok();
+char *my_strtok(char *, char *);
 #endif

Modified: projects/bsnmp-ipv6-mib/etc/mtree/BSD.tests.dist
==============================================================================
--- projects/bsnmp-ipv6-mib/etc/mtree/BSD.tests.dist	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/etc/mtree/BSD.tests.dist	Fri Jan  6 06:08:26 2017	(r311476)
@@ -594,8 +594,8 @@
                 ..
             ..
         ..
-	bsdcat
-	..
+        bsdcat
+        ..
         calendar
         ..
         cmp

Modified: projects/bsnmp-ipv6-mib/etc/mtree/BSD.var.dist
==============================================================================
--- projects/bsnmp-ipv6-mib/etc/mtree/BSD.var.dist	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/etc/mtree/BSD.var.dist	Fri Jan  6 06:08:26 2017	(r311476)
@@ -28,7 +28,7 @@
 /set gname=wheel
     backups
     ..
-    cache		mode=0755
+    cache               mode=0755
     ..
     crash
     ..

Modified: projects/bsnmp-ipv6-mib/lib/libc/x86/sys/__vdso_gettc.c
==============================================================================
--- projects/bsnmp-ipv6-mib/lib/libc/x86/sys/__vdso_gettc.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/lib/libc/x86/sys/__vdso_gettc.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2012 Konstantin Belousov <kib at FreeBSD.org>
- * Copyright (c) 2016 The FreeBSD Foundation
+ * Copyright (c) 2016, 2017 The FreeBSD Foundation
  * All rights reserved.
  *
  * Portions of this software were developed by Konstantin Belousov
@@ -42,11 +42,11 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 #include "un-namespace.h"
+#include <machine/atomic.h>
 #include <machine/cpufunc.h>
 #include <machine/specialreg.h>
 #include <dev/acpica/acpi_hpet.h>
 #ifdef __amd64__
-#include <machine/atomic.h>
 #include <dev/hyperv/hyperv.h>
 #endif
 #include "libc_private.h"
@@ -115,37 +115,47 @@ __vdso_rdtsc32(void)
 	return (rdtsc32());
 }
 
-static char *hpet_dev_map = NULL;
-static uint32_t hpet_idx = 0xffffffff;
+#define	HPET_DEV_MAP_MAX	10
+static volatile char *hpet_dev_map[HPET_DEV_MAP_MAX];
 
 static void
 __vdso_init_hpet(uint32_t u)
 {
 	static const char devprefix[] = "/dev/hpet";
 	char devname[64], *c, *c1, t;
+	volatile char *new_map, *old_map;
+	uint32_t u1;
 	int fd;
 
 	c1 = c = stpcpy(devname, devprefix);
-	u = hpet_idx;
+	u1 = u;
 	do {
-		*c++ = u % 10 + '0';
-		u /= 10;
-	} while (u != 0);
+		*c++ = u1 % 10 + '0';
+		u1 /= 10;
+	} while (u1 != 0);
 	*c = '\0';
 	for (c--; c1 != c; c1++, c--) {
 		t = *c1;
 		*c1 = *c;
 		*c = t;
 	}
+
+	old_map = hpet_dev_map[u];
+	if (old_map != NULL)
+		return;
+
 	fd = _open(devname, O_RDONLY);
 	if (fd == -1) {
-		hpet_dev_map = MAP_FAILED;
+		atomic_cmpset_rel_ptr((volatile uintptr_t *)&hpet_dev_map[u],
+		    (uintptr_t)old_map, (uintptr_t)MAP_FAILED);
 		return;
 	}
-	if (hpet_dev_map != NULL && hpet_dev_map != MAP_FAILED)
-		munmap(hpet_dev_map, PAGE_SIZE);
-	hpet_dev_map = mmap(NULL, PAGE_SIZE, PROT_READ, MAP_SHARED, fd, 0);
+	new_map = mmap(NULL, PAGE_SIZE, PROT_READ, MAP_SHARED, fd, 0);
 	_close(fd);
+	if (atomic_cmpset_rel_ptr((volatile uintptr_t *)&hpet_dev_map[u],
+	    (uintptr_t)old_map, (uintptr_t)new_map) == 0 &&
+	    new_map != MAP_FAILED)
+		munmap((void *)new_map, PAGE_SIZE);
 }
 
 #ifdef __amd64__
@@ -213,7 +223,8 @@ __vdso_hyperv_tsc(struct hyperv_reftsc *
 int
 __vdso_gettc(const struct vdso_timehands *th, u_int *tc)
 {
-	uint32_t tmp;
+	volatile char *map;
+	uint32_t idx;
 
 	switch (th->th_algo) {
 	case VDSO_TH_ALGO_X86_TSC:
@@ -221,14 +232,19 @@ __vdso_gettc(const struct vdso_timehands
 		    __vdso_rdtsc32();
 		return (0);
 	case VDSO_TH_ALGO_X86_HPET:
-		tmp = th->th_x86_hpet_idx;
-		if (hpet_dev_map == NULL || tmp != hpet_idx) {
-			hpet_idx = tmp;
-			__vdso_init_hpet(hpet_idx);
+		idx = th->th_x86_hpet_idx;
+		if (idx >= HPET_DEV_MAP_MAX)
+			return (ENOSYS);
+		map = (volatile char *)atomic_load_acq_ptr(
+		    (volatile uintptr_t *)&hpet_dev_map[idx]);
+		if (map == NULL) {
+			__vdso_init_hpet(idx);
+			map = (volatile char *)atomic_load_acq_ptr(
+			    (volatile uintptr_t *)&hpet_dev_map[idx]);
 		}
-		if (hpet_dev_map == MAP_FAILED)
+		if (map == MAP_FAILED)
 			return (ENOSYS);
-		*tc = *(volatile uint32_t *)(hpet_dev_map + HPET_MAIN_COUNTER);
+		*tc = *(volatile uint32_t *)(map + HPET_MAIN_COUNTER);
 		return (0);
 #ifdef __amd64__
 	case VDSO_TH_ALGO_X86_HVTSC:

Modified: projects/bsnmp-ipv6-mib/lib/libproc/proc_sym.c
==============================================================================
--- projects/bsnmp-ipv6-mib/lib/libproc/proc_sym.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/lib/libproc/proc_sym.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -143,10 +143,12 @@ load_symtab(Elf *e, struct symtab *symta
 	if (scn == NULL)
 		return (-1);
 
-	if ((symtab->data = elf_getdata(scn, NULL)) == NULL)
+	nsyms = shdr.sh_size / shdr.sh_entsize;
+	if (nsyms > (1 << 20))
 		return (-1);
 
-	nsyms = shdr.sh_size / shdr.sh_entsize;
+	if ((symtab->data = elf_getdata(scn, NULL)) == NULL)
+		return (-1);
 
 	symtab->index = calloc(nsyms, sizeof(u_int));
 	if (symtab->index == NULL)

Modified: projects/bsnmp-ipv6-mib/lib/libstand/Makefile
==============================================================================
--- projects/bsnmp-ipv6-mib/lib/libstand/Makefile	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/lib/libstand/Makefile	Fri Jan  6 06:08:26 2017	(r311476)
@@ -109,9 +109,9 @@ libstand_bzlib_private.h: bzlib_private.
 	sed -e 's|<stdlib.h>|"stand.h"|' \
 		${.ALLSRC} > ${.TARGET}
 
-# decompression functionality from libz
-.PATH: ${LIBSTAND_SRC}/../libz
-CFLAGS+=-DHAVE_MEMCPY -I${LIBSTAND_SRC}/../libz
+# decompression functionality from zlib
+.PATH: ${LIBSTAND_SRC}/../../contrib/zlib
+CFLAGS+=-DHAVE_MEMCPY -I${LIBSTAND_SRC}/../../contrib/zlib
 SRCS+=	adler32.c crc32.c libstand_zutil.h libstand_gzguts.h
 
 .for file in infback.c inffast.c inflate.c inftrees.c zutil.c

Modified: projects/bsnmp-ipv6-mib/lib/libz/FREEBSD-upgrade
==============================================================================
--- projects/bsnmp-ipv6-mib/lib/libz/FREEBSD-upgrade	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/lib/libz/FREEBSD-upgrade	Fri Jan  6 06:08:26 2017	(r311476)
@@ -1,44 +1,16 @@
 $FreeBSD$
 
-ZLib 1.2.2
-
-Original distribution from http://www.gzip.org/zlib/
-
-Vendor files removed from distribution before import:
-	 INDEX		 configure	 qnx/
-	 Makefile	 contrib/	 win32/
-	 Makefile.in	 msdos/		 zconf.in.h
-	 amiga/		 old/
-	 as400/		 projects/
-
-Vendor files imported:
-	 ChangeLog	 example.c	 minigzip.c
-	 FAQ		 gzio.c		 trees.c
-	 README		 infback.c	 trees.h
-	 adler32.c	 inffast.c	 uncompr.c
-	 algorithm.txt	 inffast.h	 zconf.h
-	 compress.c	 inffixed.h	 zlib.3
-	 crc32.c	 inflate.c	 zlib.h
-	 crc32.h	 inflate.h	 zutil.c
-	 deflate.c	 inftrees.c	 zutil.h
-	 deflate.h	 inftrees.h
-
-As of April, 2005, only the following three vendor files
-had non-trivial local changes:
-	 gzio.c   minigzip.c  zconf.h
-
-Added files (not from vendor):
-	 Makefile	 zopen.c	 FREEBSD-upgrade
+Original distribution from http://zlib.net/.  Currently, only trivial
+changes were made to support build of libstand and to suppress certain
+compiler warnings, we upstream our local changes whenever they would
+benefit other consumers.
 
 To Update:
   1) Unpack vendor sources into a clean directory.
-  2) Delete unnecessary files.
-  3) Import onto the vendor branch.  The 1.2.2 import was done like this:
-   cvs -d <CVSROOT> import -ko -m "ZLib 1.2.2" src/lib/libz ZLIB v1_2_2
-  4) In a clean directory, check out a fresh copy of HEAD,
-	 merging in vendor changes since the last import.
-   cvs -d <CVSROOT> co -jZLIB:yesterday -jZLIB src/lib/libz
-  5) Resolve any conflicts and commit them.
-  6) Update this file with any changes to the file list or update procedure.
+  2) Import onto the vendor area.
+  3) Merge the vendor tree to contrib/zlib, which contains a stripped down
+     version of upstream source, resolve any conflicts.
+  4) Double check zconf.h, zlib.pc, and Symbol.map to make sure that we
+     have the required changes.  Test universe and commit them.
 
-kientzle at FreeBSD.org
+delphij at FreeBSD.org

Modified: projects/bsnmp-ipv6-mib/lib/libz/Makefile
==============================================================================
--- projects/bsnmp-ipv6-mib/lib/libz/Makefile	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/lib/libz/Makefile	Fri Jan  6 06:08:26 2017	(r311476)
@@ -8,6 +8,10 @@ SHLIBDIR?=	/lib
 SHLIB_MAJOR=	6
 MAN=		zlib.3 zopen.3
 
+ZLIBSRC=	${SRCTOP}/contrib/zlib
+
+.PATH:		${ZLIBSRC}
+
 #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
 #CFLAGS=-g -DDEBUG
 #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
@@ -37,14 +41,14 @@ SRCS+=		zopen.c
 SRCS+=		zutil.c
 
 #.if ${MACHINE_ARCH} == "i386" && ${MACHINE_CPU:M*i686*}
-#.PATH:		${.CURDIR}/contrib/asm686
+#.PATH:		${ZLIBSRC}/contrib/asm686
 #SRCS+=		match.S
 #CFLAGS+=	-DASMV -DNO_UNDERLINE
 #ACFLAGS+=	-Wa,--noexecstack
 #.endif
 
 #.if ${MACHINE_ARCH} == "amd64"
-#.PATH:		${.CURDIR}/contrib/gcc_gvmat64
+#.PATH:		${ZLIBSRC}/contrib/gcc_gvmat64
 #SRCS+=		gvmat64.S
 #CFLAGS+=	-DASMV -DNO_UNDERLINE
 #ACFLAGS+=	-Wa,--noexecstack
@@ -56,7 +60,7 @@ CFLAGS+=	-DSYMBOL_VERSIONING
 
 INCS=		zconf.h zlib.h
 
-.PATH:		${.CURDIR}/test
+.PATH:		${ZLIBSRC}/test
 
 minigzip:	all minigzip.o
 	$(CC) -o minigzip minigzip.o -L. -lz

Modified: projects/bsnmp-ipv6-mib/lib/libz/Symbol.map
==============================================================================
--- projects/bsnmp-ipv6-mib/lib/libz/Symbol.map	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/lib/libz/Symbol.map	Fri Jan  6 06:08:26 2017	(r311476)
@@ -2,6 +2,17 @@
  * $FreeBSD$
  */
 
+ZLIB_1.2.9 {
+	inflateCodesUsed;
+	inflateValidate;
+	uncompress2;
+	gzfread;
+	gzfwrite;
+	deflateGetDictionary;
+	adler32_z;
+	crc32_z;
+};
+
 ZLIB_1.2.7.1 {
 	inflateGetDictionary;
 	gzvprintf;

Modified: projects/bsnmp-ipv6-mib/lib/libz/Versions.def
==============================================================================
--- projects/bsnmp-ipv6-mib/lib/libz/Versions.def	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/lib/libz/Versions.def	Fri Jan  6 06:08:26 2017	(r311476)
@@ -9,6 +9,9 @@ ZLIB_1.2.7.0 {
 ZLIB_1.2.7.1 {
 } ZLIB_1.2.7.0;
 
+ZLIB_1.2.9 {
+} ZLIB_1.2.7.1;
+
 FBSD_1.2 {
 } ZLIB_1.2.4.0;
 

Modified: projects/bsnmp-ipv6-mib/lib/libz/zlib.pc
==============================================================================
--- projects/bsnmp-ipv6-mib/lib/libz/zlib.pc	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/lib/libz/zlib.pc	Fri Jan  6 06:08:26 2017	(r311476)
@@ -7,7 +7,7 @@ includedir=${prefix}/include
 
 Name: zlib
 Description: zlib compression library
-Version: 1.2.8
+Version: 1.2.10
 
 Requires:
 Libs: -L${libdir} -L${sharedlibdir} -lz

Modified: projects/bsnmp-ipv6-mib/libexec/tftpd/Makefile
==============================================================================
--- projects/bsnmp-ipv6-mib/libexec/tftpd/Makefile	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/libexec/tftpd/Makefile	Fri Jan  6 06:08:26 2017	(r311476)
@@ -1,12 +1,17 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	tftpd
 MAN=	tftpd.8
 SRCS=	tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c tftp-utils.c
 SRCS+=	tftpd.c
 WFORMAT=0
 
+.if ${MK_TCP_WRAPPERS} != "no"
+CFLAGS+=	-DLIBWRAP
 LIBADD=	wrap
+.endif
 
 .include <bsd.prog.mk>

Modified: projects/bsnmp-ipv6-mib/libexec/tftpd/tftpd.c
==============================================================================
--- projects/bsnmp-ipv6-mib/libexec/tftpd/tftpd.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/libexec/tftpd/tftpd.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
-#include <tcpd.h>
 #include <unistd.h>
 
 #include "tftp-file.h"
@@ -75,6 +74,10 @@ __FBSDID("$FreeBSD$");
 #include "tftp-transfer.h"
 #include "tftp-options.h"
 
+#ifdef	LIBWRAP
+#include <tcpd.h>
+#endif
+
 static void	tftp_wrq(int peer, char *, ssize_t);
 static void	tftp_rrq(int peer, char *, ssize_t);
 
@@ -281,6 +284,7 @@ main(int argc, char *argv[])
 		}
 	}
 
+#ifdef	LIBWRAP
 	/*
 	 * See if the client is allowed to talk to me.
 	 * (This needs to be done before the chroot())
@@ -329,6 +333,7 @@ main(int argc, char *argv[])
 				    "Full access allowed"
 				    "in /etc/hosts.allow");
 	}
+#endif
 
 	/*
 	 * Since we exit here, we should do that only after the above

Modified: projects/bsnmp-ipv6-mib/sbin/dhclient/dispatch.c
==============================================================================
--- projects/bsnmp-ipv6-mib/sbin/dhclient/dispatch.c	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/sbin/dhclient/dispatch.c	Fri Jan  6 06:08:26 2017	(r311476)
@@ -454,16 +454,12 @@ add_protocol(char *name, int fd, void (*
 void
 remove_protocol(struct protocol *proto)
 {
-	struct protocol *p, *next, *prev;
+	struct protocol *p, *next;
 
-	prev = NULL;
 	for (p = protocols; p; p = next) {
 		next = p->next;
 		if (p == proto) {
-			if (prev)
-				prev->next = p->next;
-			else
-				protocols = p->next;
+			protocols = p->next;
 			free(p);
 		}
 	}

Modified: projects/bsnmp-ipv6-mib/sys/arm/conf/ARMADA38X
==============================================================================
--- projects/bsnmp-ipv6-mib/sys/arm/conf/ARMADA38X	Fri Jan  6 05:10:49 2017	(r311475)
+++ projects/bsnmp-ipv6-mib/sys/arm/conf/ARMADA38X	Fri Jan  6 06:08:26 2017	(r311476)
@@ -37,6 +37,9 @@ device		vlan
 device		mii
 device		bpf
 device		re
+device		mdio
+device		etherswitch
+device		e6000sw
 
 # PCI
 device		pci

Copied: projects/bsnmp-ipv6-mib/sys/boot/fdt/dts/arm/armada-385-db-ap.dts (from r311475, head/sys/boot/fdt/dts/arm/armada-385-db-ap.dts)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bsnmp-ipv6-mib/sys/boot/fdt/dts/arm/armada-385-db-ap.dts	Fri Jan  6 06:08:26 2017	(r311476, copy of r311475, head/sys/boot/fdt/dts/arm/armada-385-db-ap.dts)
@@ -0,0 +1,271 @@
+/*
+ * Device Tree file for Marvell Armada 385 Access Point Development board
+ * (DB-88F6820-AP)
+ *
+ *  Copyright (C) 2014 Marvell
+ *
+ * Nadav Haklai <nadavh at marvell.com>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is licensed under the terms of the GNU General Public
+ *     License version 2.  This program is licensed "as is" without

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
