From 83ecf2683382b11562ab4d4ec10c971b655950f2 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 30 May 2023 16:02:25 +0100 Subject: util/*: Properly detect OpenBSD for pledge() call The utils that are pledged checked HAVE_PLEDGE which was bogus. OpenBSD defines __OpenBSD__, which you can check for in ifdef. This change makes nvmutil and spkmodem-recv *actually* use pledge, when the utils are compiled on OpenBSD. Signed-off-by: Leah Rowe --- util/nvmutil/nvmutil.c | 4 ++-- util/spkmodem_recv/spkmodem-recv.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c index a489dd8d..0eaa8f43 100644 --- a/util/nvmutil/nvmutil.c +++ b/util/nvmutil/nvmutil.c @@ -83,7 +83,7 @@ main(int argc, char *argv[]) void (*cmd)(void) = NULL; const char *strMac = NULL, *strRMac = "??:??:??:??:??:??"; -#ifdef HAVE_PLEDGE /* openbsd */ +#ifdef __OpenBSD__ if (pledge("stdio wpath", NULL) == -1) err(errno, "pledge"); #endif @@ -96,7 +96,7 @@ main(int argc, char *argv[]) if (argc == 3) { if (strcmp(COMMAND, "dump") == 0) { -#ifdef HAVE_PLEDGE /* openbsd */ +#ifdef __OpenBSD__ if (pledge("stdio rpath", NULL) == -1) err(errno, "pledge"); #endif diff --git a/util/spkmodem_recv/spkmodem-recv.c b/util/spkmodem_recv/spkmodem-recv.c index 30e13d8a..d13d8c7d 100644 --- a/util/spkmodem_recv/spkmodem-recv.c +++ b/util/spkmodem_recv/spkmodem-recv.c @@ -36,7 +36,7 @@ main(int argc, char *argv[]) { int c; -#ifdef HAVE_PLEDGE +#ifdef __OpenBSD__ if (pledge("stdio", NULL) == -1) err(errno, "pledge"); #endif -- cgit v1.2.1