Update to FreeBSD head 2017-12-01

Git mirror commit e724f51f811a4b2bd29447f8b85ab5c2f9b88266.

Update #3472.

38 files changed, 116 insertions, 11 deletions

diff --git a/freebsd/include/arpa/nameser.h b/freebsd/include/arpa/nameser.h
index ef47b204..f0e3482a 100644
--- a/freebsd/include/arpa/nameser.h
+++ b/freebsd/include/arpa/nameser.h
@@ -15,7 +15,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1989, 1993
  *    The Regents of the University of California.  All rights reserved.
  *
diff --git a/freebsd/include/arpa/nameser_compat.h b/freebsd/include/arpa/nameser_compat.h
index e7b58056..1035c3fc 100644
--- a/freebsd/include/arpa/nameser_compat.h
+++ b/freebsd/include/arpa/nameser_compat.h
@@ -1,4 +1,7 @@
-/* Copyright (c) 1983, 1989
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 1983, 1989
  *    The Regents of the University of California.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
diff --git a/freebsd/include/db.h b/freebsd/include/db.h
index 4d04db41..13fa91d6 100644
--- a/freebsd/include/db.h
+++ b/freebsd/include/db.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/freebsd/include/err.h b/freebsd/include/err.h
index f81742ff..636185e2 100644
--- a/freebsd/include/err.h
+++ b/freebsd/include/err.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/freebsd/include/mpool.h b/freebsd/include/mpool.h
index 3f22ab78..2c686602 100644
--- a/freebsd/include/mpool.h
+++ b/freebsd/include/mpool.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/freebsd/include/netconfig.h b/freebsd/include/netconfig.h
index 80dc0da2..b459e2ee 100644
--- a/freebsd/include/netconfig.h
+++ b/freebsd/include/netconfig.h
@@ -1,6 +1,36 @@
-/*	$NetBSD: netconfig.h,v 1.1 2000/06/02 22:57:54 fvdl Exp $	*/
+/*	$NetBSD: netconfig.h,v 1.6 2008/04/28 20:22:54 martin Exp $	*/
 /*	$FreeBSD$ */
 
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
+ * Copyright (c) 2004 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Frank van der Linden.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #ifndef _NETCONFIG_H_
 #define _NETCONFIG_H_
@@ -30,10 +60,10 @@ typedef struct {
 /*
  * nc_semantics values
  */
-#define NC_TPI_CLTS	1
-#define NC_TPI_COTS	2
-#define NC_TPI_COTS_ORD	3
-#define NC_TPI_RAW	4
+#define NC_TPI_CLTS	1	/* Connectionless transport */
+#define NC_TPI_COTS	2	/* Connection oriented transport */
+#define NC_TPI_COTS_ORD	3	/* Connection oriented, ordered transport */
+#define NC_TPI_RAW	4	/* Raw connection */
 
 /*
  * nc_flag values
diff --git a/freebsd/include/netdb.h b/freebsd/include/netdb.h
index 2da7755d..f46f5a3c 100644
--- a/freebsd/include/netdb.h
+++ b/freebsd/include/netdb.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1983, 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/freebsd/include/nlist.h b/freebsd/include/nlist.h
index a4965fd9..5ea6f5ea 100644
--- a/freebsd/include/nlist.h
+++ b/freebsd/include/nlist.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
diff --git a/freebsd/include/nsswitch.h b/freebsd/include/nsswitch.h
index d1839002..ed4f3ccd 100644
--- a/freebsd/include/nsswitch.h
+++ b/freebsd/include/nsswitch.h
@@ -2,6 +2,8 @@
 /*	$FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
+ *
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/resolv.h b/freebsd/include/resolv.h
index e3d4fd12..1f4a9bc8 100644
--- a/freebsd/include/resolv.h
+++ b/freebsd/include/resolv.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Portions Copyright (C) 2004, 2005, 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1995-2003  Internet Software Consortium.
  *
diff --git a/freebsd/include/rpc/auth.h b/freebsd/include/rpc/auth.h
index 5503762b..bf0d76c0 100644
--- a/freebsd/include/rpc/auth.h
+++ b/freebsd/include/rpc/auth.h
@@ -1,6 +1,8 @@
 /*	$NetBSD: auth.h,v 1.15 2000/06/02 22:57:55 fvdl Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/auth_des.h b/freebsd/include/rpc/auth_des.h
index 58b34d77..3b860d8c 100644
--- a/freebsd/include/rpc/auth_des.h
+++ b/freebsd/include/rpc/auth_des.h
@@ -1,6 +1,8 @@
 /*	@(#)auth_des.h	2.2 88/07/29 4.0 RPCSRC; from 1.3 88/02/08 SMI */
 /*	$FreeBSD$ */
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/auth_kerb.h b/freebsd/include/rpc/auth_kerb.h
index b6c5ae10..29b09d50 100644
--- a/freebsd/include/rpc/auth_kerb.h
+++ b/freebsd/include/rpc/auth_kerb.h
@@ -1,5 +1,7 @@
 /*	$FreeBSD$ */
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/auth_unix.h b/freebsd/include/rpc/auth_unix.h
index fa47e8ba..6d1fc315 100644
--- a/freebsd/include/rpc/auth_unix.h
+++ b/freebsd/include/rpc/auth_unix.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/clnt.h b/freebsd/include/rpc/clnt.h
index 66533e24..8d9ce1ec 100644
--- a/freebsd/include/rpc/clnt.h
+++ b/freebsd/include/rpc/clnt.h
@@ -1,6 +1,8 @@
 /*	$NetBSD: clnt.h,v 1.14 2000/06/02 22:57:55 fvdl Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2010, Oracle America, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/clnt_soc.h b/freebsd/include/rpc/clnt_soc.h
index 6536a4bb..c16609bb 100644
--- a/freebsd/include/rpc/clnt_soc.h
+++ b/freebsd/include/rpc/clnt_soc.h
@@ -2,6 +2,8 @@
 /*	$FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/des.h b/freebsd/include/rpc/des.h
index 9400ccdf..93698cce 100644
--- a/freebsd/include/rpc/des.h
+++ b/freebsd/include/rpc/des.h
@@ -1,6 +1,8 @@
 /*  @(#)des.h	2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI  */
 /* $FreeBSD$ */
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/des_crypt.h b/freebsd/include/rpc/des_crypt.h
index af33e9d6..ef938c5c 100644
--- a/freebsd/include/rpc/des_crypt.h
+++ b/freebsd/include/rpc/des_crypt.h
@@ -6,6 +6,8 @@
  * Copyright (C) 1986, Sun Microsystems, Inc.
  */
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/nettype.h b/freebsd/include/rpc/nettype.h
index 3ded8928..39c1f769 100644
--- a/freebsd/include/rpc/nettype.h
+++ b/freebsd/include/rpc/nettype.h
@@ -2,6 +2,8 @@
 /*	$FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/pmap_clnt.h b/freebsd/include/rpc/pmap_clnt.h
index e8314f60..465cb0c0 100644
--- a/freebsd/include/rpc/pmap_clnt.h
+++ b/freebsd/include/rpc/pmap_clnt.h
@@ -1,6 +1,8 @@
 /*	$NetBSD: pmap_clnt.h,v 1.9 2000/06/02 22:57:55 fvdl Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/pmap_prot.h b/freebsd/include/rpc/pmap_prot.h
index d880c40d..f69bad9c 100644
--- a/freebsd/include/rpc/pmap_prot.h
+++ b/freebsd/include/rpc/pmap_prot.h
@@ -1,6 +1,8 @@
 /*	$NetBSD: pmap_prot.h,v 1.8 2000/06/02 22:57:55 fvdl Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/pmap_rmt.h b/freebsd/include/rpc/pmap_rmt.h
index 21eb5d1b..791b3f48 100644
--- a/freebsd/include/rpc/pmap_rmt.h
+++ b/freebsd/include/rpc/pmap_rmt.h
@@ -1,6 +1,8 @@
 /*	$NetBSD: pmap_rmt.h,v 1.7 1998/02/11 23:01:23 lukem Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/raw.h b/freebsd/include/rpc/raw.h
index a5c7d935..b56b9026 100644
--- a/freebsd/include/rpc/raw.h
+++ b/freebsd/include/rpc/raw.h
@@ -2,6 +2,8 @@
 /*	$FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/rpc.h b/freebsd/include/rpc/rpc.h
index e7a3dc8d..561437c3 100644
--- a/freebsd/include/rpc/rpc.h
+++ b/freebsd/include/rpc/rpc.h
@@ -1,6 +1,8 @@
 /*	$NetBSD: rpc.h,v 1.13 2000/06/02 22:57:56 fvdl Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/rpc_com.h b/freebsd/include/rpc/rpc_com.h
index 0996efc0..dd331e26 100644
--- a/freebsd/include/rpc/rpc_com.h
+++ b/freebsd/include/rpc/rpc_com.h
@@ -2,6 +2,8 @@
 /*	$FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/rpc_msg.h b/freebsd/include/rpc/rpc_msg.h
index fdde3875..35b816fd 100644
--- a/freebsd/include/rpc/rpc_msg.h
+++ b/freebsd/include/rpc/rpc_msg.h
@@ -1,6 +1,8 @@
 /*	$NetBSD: rpc_msg.h,v 1.11 2000/06/02 22:57:56 fvdl Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/rpcb_clnt.h b/freebsd/include/rpc/rpcb_clnt.h
index 45527872..b642aacd 100644
--- a/freebsd/include/rpc/rpcb_clnt.h
+++ b/freebsd/include/rpc/rpcb_clnt.h
@@ -2,6 +2,8 @@
 /*	$FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/rpcent.h b/freebsd/include/rpc/rpcent.h
index c1650fa4..15c4ae4d 100644
--- a/freebsd/include/rpc/rpcent.h
+++ b/freebsd/include/rpc/rpcent.h
@@ -2,6 +2,8 @@
 /*	$FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/rpcsec_gss.h b/freebsd/include/rpc/rpcsec_gss.h
index ccd346fd..2878ae04 100644
--- a/freebsd/include/rpc/rpcsec_gss.h
+++ b/freebsd/include/rpc/rpcsec_gss.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2008 Doug Rabson
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/svc.h b/freebsd/include/rpc/svc.h
index c7989b03..83bbfb27 100644
--- a/freebsd/include/rpc/svc.h
+++ b/freebsd/include/rpc/svc.h
@@ -1,6 +1,8 @@
 /*	$NetBSD: svc.h,v 1.17 2000/06/02 22:57:56 fvdl Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/svc_auth.h b/freebsd/include/rpc/svc_auth.h
index 87b8efe7..e9b6cd4b 100644
--- a/freebsd/include/rpc/svc_auth.h
+++ b/freebsd/include/rpc/svc_auth.h
@@ -1,6 +1,8 @@
 /*	$NetBSD: svc_auth.h,v 1.8 2000/06/02 22:57:57 fvdl Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/svc_dg.h b/freebsd/include/rpc/svc_dg.h
index 313176ea..d9f3012c 100644
--- a/freebsd/include/rpc/svc_dg.h
+++ b/freebsd/include/rpc/svc_dg.h
@@ -2,6 +2,8 @@
 /*	$FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/svc_soc.h b/freebsd/include/rpc/svc_soc.h
index 311c8322..912e2ec2 100644
--- a/freebsd/include/rpc/svc_soc.h
+++ b/freebsd/include/rpc/svc_soc.h
@@ -2,6 +2,8 @@
 /*	$FreeBSD$ */
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpc/xdr.h b/freebsd/include/rpc/xdr.h
index daee333f..9e239337 100644
--- a/freebsd/include/rpc/xdr.h
+++ b/freebsd/include/rpc/xdr.h
@@ -1,6 +1,8 @@
 /*	$NetBSD: xdr.h,v 1.19 2000/07/17 05:00:45 matt Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
  *
diff --git a/freebsd/include/rpcsvc/nis_tags.h b/freebsd/include/rpcsvc/nis_tags.h
index 7ee630e6..55920a02 100644
--- a/freebsd/include/rpcsvc/nis_tags.h
+++ b/freebsd/include/rpcsvc/nis_tags.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2010, Oracle America, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/freebsd/include/rpcsvc/yp_prot.h b/freebsd/include/rpcsvc/yp_prot.h
index 6b2e28af..a0090ac6 100644
--- a/freebsd/include/rpcsvc/yp_prot.h
+++ b/freebsd/include/rpcsvc/yp_prot.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
  * All rights reserved.
  *
diff --git a/freebsd/include/rpcsvc/ypclnt.h b/freebsd/include/rpcsvc/ypclnt.h
index abde97c3..c0a0a46e 100644
--- a/freebsd/include/rpcsvc/ypclnt.h
+++ b/freebsd/include/rpcsvc/ypclnt.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
  * All rights reserved.
  *
diff --git a/freebsd/include/sysexits.h b/freebsd/include/sysexits.h
index e52bb5be..5e414f24 100644
--- a/freebsd/include/sysexits.h
+++ b/freebsd/include/sysexits.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1987, 1993
  *	The Regents of the University of California.  All rights reserved.
  *