From 1a1b9e989b641507c06bd9c5d1c709daa708bbb9 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Mon, 30 Jun 2014 00:26:22 +0000
Subject: [PATCH] sys/types.h rather than sys/param.h, where applicable.  avoid
 overreach.

---
 src/lib/libutil/bcrypt_pbkdf.c     | 3 +--
 src/lib/libutil/getmaxpartitions.c | 4 ++--
 src/lib/libutil/getrawpartition.c  | 4 ++--
 src/lib/libutil/imsg.c             | 4 ++--
 src/lib/libutil/login_tty.c        | 4 ++--
 src/lib/libutil/opendisk.c         | 4 ++--
 src/lib/libutil/pidfile.c          | 4 ++--
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/lib/libutil/bcrypt_pbkdf.c b/src/lib/libutil/bcrypt_pbkdf.c
index 8275b66b..7394667c 100644
--- a/src/lib/libutil/bcrypt_pbkdf.c
+++ b/src/lib/libutil/bcrypt_pbkdf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bcrypt_pbkdf.c,v 1.7 2014/04/08 14:20:01 tedu Exp $ */
+/* $OpenBSD: bcrypt_pbkdf.c,v 1.8 2014/06/30 00:26:22 deraadt Exp $ */
 /*
  * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
  *
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
 #include <sys/param.h>
 
 #include <stdlib.h>
diff --git a/src/lib/libutil/getmaxpartitions.c b/src/lib/libutil/getmaxpartitions.c
index b06b8b57..574b6c6e 100644
--- a/src/lib/libutil/getmaxpartitions.c
+++ b/src/lib/libutil/getmaxpartitions.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getmaxpartitions.c,v 1.7 2008/06/26 05:42:05 ray Exp $	*/
+/*	$OpenBSD: getmaxpartitions.c,v 1.8 2014/06/30 00:26:22 deraadt Exp $	*/
 /*	$NetBSD: getmaxpartitions.c,v 1.1 1996/05/16 07:03:31 thorpej Exp $	*/
 
 /*-
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/sysctl.h>
 
 #include "util.h"
diff --git a/src/lib/libutil/getrawpartition.c b/src/lib/libutil/getrawpartition.c
index 363cec9a..1363804c 100644
--- a/src/lib/libutil/getrawpartition.c
+++ b/src/lib/libutil/getrawpartition.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getrawpartition.c,v 1.7 2008/06/26 05:42:05 ray Exp $	*/
+/*	$OpenBSD: getrawpartition.c,v 1.8 2014/06/30 00:26:22 deraadt Exp $	*/
 /*	$NetBSD: getrawpartition.c,v 1.1 1996/05/16 07:03:33 thorpej Exp $	*/
 
 /*-
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/sysctl.h>
 
 #include "util.h"
diff --git a/src/lib/libutil/imsg.c b/src/lib/libutil/imsg.c
index 7751cad1..4720cd5f 100644
--- a/src/lib/libutil/imsg.c
+++ b/src/lib/libutil/imsg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: imsg.c,v 1.5 2013/12/26 17:32:33 eric Exp $	*/
+/*	$OpenBSD: imsg.c,v 1.6 2014/06/30 00:26:22 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
diff --git a/src/lib/libutil/login_tty.c b/src/lib/libutil/login_tty.c
index 3a0ce71a..89a63350 100644
--- a/src/lib/libutil/login_tty.c
+++ b/src/lib/libutil/login_tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login_tty.c,v 1.8 2009/08/01 17:11:21 millert Exp $	*/
+/*	$OpenBSD: login_tty.c,v 1.9 2014/06/30 00:26:22 deraadt Exp $	*/
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 
diff --git a/src/lib/libutil/opendisk.c b/src/lib/libutil/opendisk.c
index 3840f705..ffe7a1d2 100644
--- a/src/lib/libutil/opendisk.c
+++ b/src/lib/libutil/opendisk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opendisk.c,v 1.6 2012/12/05 23:20:06 deraadt Exp $	*/
+/*	$OpenBSD: opendisk.c,v 1.7 2014/06/30 00:26:22 deraadt Exp $	*/
 /*	$NetBSD: opendisk.c,v 1.4 1997/09/30 17:13:50 phil Exp $	*/
 
 /*-
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/lib/libutil/pidfile.c b/src/lib/libutil/pidfile.c
index 15f7c3a3..9bb68eb1 100644
--- a/src/lib/libutil/pidfile.c
+++ b/src/lib/libutil/pidfile.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pidfile.c,v 1.9 2013/10/01 16:47:42 millert Exp $	*/
+/*	$OpenBSD: pidfile.c,v 1.10 2014/06/30 00:26:22 deraadt Exp $	*/
 /*	$NetBSD: pidfile.c,v 1.4 2001/02/19 22:43:42 cgd Exp $	*/
 
 /*-
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <errno.h>
 #include <paths.h>
 #include <stdio.h>