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/passwd.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 'src/usr.bin/openssl/passwd.c')
| -rw-r--r-- | src/usr.bin/openssl/passwd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/usr.bin/openssl/passwd.c b/src/usr.bin/openssl/passwd.c index 7ef7ef456c..04da52ee68 100644 --- a/src/usr.bin/openssl/passwd.c +++ b/src/usr.bin/openssl/passwd.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: passwd.c,v 1.6 2015/10/17 07:51:10 semarie Exp $ */ | 1 | /* $OpenBSD: passwd.c,v 1.7 2015/10/17 15:00:11 doug Exp $ */ |
| 2 | 2 | ||
| 3 | #if defined OPENSSL_NO_MD5 | 3 | #if defined OPENSSL_NO_MD5 |
| 4 | #define NO_MD5CRYPT_1 | 4 | #define NO_MD5CRYPT_1 |
| @@ -146,8 +146,10 @@ passwd_main(int argc, char **argv) | |||
| 146 | int ret = 1; | 146 | int ret = 1; |
| 147 | 147 | ||
| 148 | if (single_execution) { | 148 | if (single_execution) { |
| 149 | if (pledge("stdio rpath wpath cpath tty", NULL) == -1) | 149 | if (pledge("stdio rpath wpath cpath tty", NULL) == -1) { |
| 150 | perror("pledge"); | 150 | perror("pledge"); |
| 151 | exit(1); | ||
| 152 | } | ||
| 151 | } | 153 | } |
| 152 | 154 | ||
| 153 | memset(&passwd_config, 0, sizeof(passwd_config)); | 155 | memset(&passwd_config, 0, sizeof(passwd_config)); |
