From d76eef3430e27ec08548476dc1c1dbfe7f63b1f4 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 17 Apr 2019 16:18:14 +0000
Subject: [PATCH] cap_fileargs: chase r346315, update fileargs_init in
 consumers

Reported by:	ci.freebsd.org (8 times so far)
MFC after:	3 weeks
MFC with:	r346315
Sponsored by:	The FreeBSD Foundation
---
 contrib/elftoolchain/strings/strings.c | 2 +-
 sbin/savecore/savecore.c               | 2 +-
 usr.bin/brandelf/brandelf.c            | 2 +-
 usr.bin/head/head.c                    | 2 +-
 usr.bin/wc/wc.c                        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/elftoolchain/strings/strings.c b/contrib/elftoolchain/strings/strings.c
index e89f90f3ef49..a84ff393e47d 100644
--- a/contrib/elftoolchain/strings/strings.c
+++ b/contrib/elftoolchain/strings/strings.c
@@ -195,7 +195,7 @@ main(int argc, char **argv)
 	argv += optind;
 
 	cap_rights_init(&rights, CAP_READ, CAP_SEEK, CAP_FSTAT, CAP_FCNTL);
-	fa = fileargs_init(argc, argv, O_RDONLY, 0, &rights);
+	fa = fileargs_init(argc, argv, O_RDONLY, 0, &rights, FA_OPEN);
 	if (fa == NULL)
 		err(1, "Unable to initialize casper fileargs");
 
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index 4655818a63e5..fc6a50a0eb15 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -1030,7 +1030,7 @@ init_caps(int argc, char **argv)
 	 */
 	(void)cap_rights_init(&rights, CAP_PREAD, CAP_WRITE, CAP_IOCTL);
 	capfa = fileargs_init(argc, argv, checkfor || keep ? O_RDONLY : O_RDWR,
-	    0, &rights);
+	    0, &rights, FA_OPEN);
 	if (capfa == NULL) {
 		logmsg(LOG_ERR, "fileargs_init(): %m");
 		exit(1);
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index c7ce94112365..4d5fcf678ee6 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.c
@@ -133,7 +133,7 @@ main(int argc, char **argv)
 	if (flags == O_RDWR)
 		cap_rights_set(&rights, CAP_WRITE);
 
-	fa = fileargs_init(argc, argv, flags, 0, &rights);
+	fa = fileargs_init(argc, argv, flags, 0, &rights, FA_OPEN);
 	if (fa == NULL)
 		errx(1, "unable to init casper");
 
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index a27acea565a0..a06899f1ddd2 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -115,7 +115,7 @@ main(int argc, char *argv[])
 	argv += optind;
 
 	fa = fileargs_init(argc, argv, O_RDONLY, 0,
-	    cap_rights_init(&rights, CAP_READ, CAP_FSTAT, CAP_FCNTL));
+	    cap_rights_init(&rights, CAP_READ, CAP_FSTAT, CAP_FCNTL), FA_OPEN);
 	if (fa == NULL)
 		errx(1, "unable to init casper");
 
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index 0517b67de69d..2d3d57df3696 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -133,7 +133,7 @@ main(int argc, char *argv[])
 	(void)signal(SIGINFO, siginfo_handler);
 
 	fa = fileargs_init(argc, argv, O_RDONLY, 0,
-	    cap_rights_init(&rights, CAP_READ, CAP_FSTAT));
+	    cap_rights_init(&rights, CAP_READ, CAP_FSTAT), FA_OPEN);
 	if (fa == NULL) {
 		xo_warn("Unable to init casper");
 		exit(1);