diff options
author | doug <> | 2015-10-17 15:00:11 +0000 |
---|---|---|
committer | doug <> | 2015-10-17 15:00:11 +0000 |
commit | 543f0f34095fd3775350a028db241378f1e4dd80 (patch) | |
tree | 9f56dde9b92f4c14124c4eab1e2457907ad59f71 /src/usr.bin/openssl/s_server.c | |
parent | 0713745868dc436c5b2e8e3b2b1951e7a897b163 (diff) | |
download | openbsd-543f0f34095fd3775350a028db241378f1e4dd80.tar.gz openbsd-543f0f34095fd3775350a028db241378f1e4dd80.tar.bz2 openbsd-543f0f34095fd3775350a028db241378f1e4dd80.zip |
Exit if a pledge call fails in non-interactive mode.
ok semarie@
Diffstat (limited to 'src/usr.bin/openssl/s_server.c')
-rw-r--r-- | src/usr.bin/openssl/s_server.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/usr.bin/openssl/s_server.c b/src/usr.bin/openssl/s_server.c index 33765eeedb..a2dd1f0b75 100644 --- a/src/usr.bin/openssl/s_server.c +++ b/src/usr.bin/openssl/s_server.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s_server.c,v 1.21 2015/10/17 07:51:10 semarie Exp $ */ | 1 | /* $OpenBSD: s_server.c,v 1.22 2015/10/17 15:00:11 doug Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -605,8 +605,10 @@ s_server_main(int argc, char *argv[]) | |||
605 | tlsextalpnctx alpn_ctx = { NULL, 0 }; | 605 | tlsextalpnctx alpn_ctx = { NULL, 0 }; |
606 | 606 | ||
607 | if (single_execution) { | 607 | if (single_execution) { |
608 | if (pledge("stdio inet rpath tty", NULL) == -1) | 608 | if (pledge("stdio inet rpath tty", NULL) == -1) { |
609 | perror("pledge"); | 609 | perror("pledge"); |
610 | exit(1); | ||
611 | } | ||
610 | } | 612 | } |
611 | 613 | ||
612 | meth = SSLv23_server_method(); | 614 | meth = SSLv23_server_method(); |