diff options
| author | doug <> | 2015-10-17 15:00:11 +0000 |
|---|---|---|
| committer | doug <> | 2015-10-17 15:00:11 +0000 |
| commit | db101f70294bca3ebe9eaa1f16aaae8cd872d2e4 (patch) | |
| tree | 9f56dde9b92f4c14124c4eab1e2457907ad59f71 /src/usr.bin/openssl/spkac.c | |
| parent | c93eb1877de5865e80d306506ac0af05c8ac5bde (diff) | |
| download | openbsd-db101f70294bca3ebe9eaa1f16aaae8cd872d2e4.tar.gz openbsd-db101f70294bca3ebe9eaa1f16aaae8cd872d2e4.tar.bz2 openbsd-db101f70294bca3ebe9eaa1f16aaae8cd872d2e4.zip | |
Exit if a pledge call fails in non-interactive mode.
ok semarie@
Diffstat (limited to '')
| -rw-r--r-- | src/usr.bin/openssl/spkac.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/usr.bin/openssl/spkac.c b/src/usr.bin/openssl/spkac.c index 7eff70b5e6..426ea13431 100644 --- a/src/usr.bin/openssl/spkac.c +++ b/src/usr.bin/openssl/spkac.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: spkac.c,v 1.7 2015/10/17 07:51:10 semarie Exp $ */ | 1 | /* $OpenBSD: spkac.c,v 1.8 2015/10/17 15:00:11 doug Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 1999. Based on an original idea by Massimiliano Pala | 3 | * project 1999. Based on an original idea by Massimiliano Pala |
| 4 | * (madwolf@openca.org). | 4 | * (madwolf@openca.org). |
| @@ -182,8 +182,10 @@ spkac_main(int argc, char **argv) | |||
| 182 | EVP_PKEY *pkey = NULL; | 182 | EVP_PKEY *pkey = NULL; |
| 183 | 183 | ||
| 184 | if (single_execution) { | 184 | if (single_execution) { |
| 185 | if (pledge("stdio rpath wpath cpath tty", NULL) == -1) | 185 | if (pledge("stdio rpath wpath cpath tty", NULL) == -1) { |
| 186 | perror("pledge"); | 186 | perror("pledge"); |
| 187 | exit(1); | ||
| 188 | } | ||
| 187 | } | 189 | } |
| 188 | 190 | ||
| 189 | memset(&spkac_config, 0, sizeof(spkac_config)); | 191 | memset(&spkac_config, 0, sizeof(spkac_config)); |
