diff options
| author | jca <> | 2015-12-01 12:01:56 +0000 |
|---|---|---|
| committer | jca <> | 2015-12-01 12:01:56 +0000 |
| commit | 2a1278695fa78debc901cba2f1514ecfdceb5e96 (patch) | |
| tree | a223eacb33cfe98d55b59e35bb20bd104b9f62d6 /src | |
| parent | cab5331381011c297b4793dd3ddc4bb1a0287a05 (diff) | |
| download | openbsd-2a1278695fa78debc901cba2f1514ecfdceb5e96.tar.gz openbsd-2a1278695fa78debc901cba2f1514ecfdceb5e96.tar.bz2 openbsd-2a1278695fa78debc901cba2f1514ecfdceb5e96.zip | |
Undo previous, pledge("dns") was already present. The problem was in s_server.
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr.bin/openssl/openssl.c | 4 | ||||
| -rw-r--r-- | src/usr.bin/openssl/s_client.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/usr.bin/openssl/openssl.c b/src/usr.bin/openssl/openssl.c index 08a5929611..fec46aceaf 100644 --- a/src/usr.bin/openssl/openssl.c +++ b/src/usr.bin/openssl/openssl.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: openssl.c,v 1.22 2015/12/01 01:24:47 beck Exp $ */ | 1 | /* $OpenBSD: openssl.c,v 1.23 2015/12/01 12:01:56 jca 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 | * |
| @@ -438,7 +438,7 @@ main(int argc, char **argv) | |||
| 438 | arg.data = NULL; | 438 | arg.data = NULL; |
| 439 | arg.count = 0; | 439 | arg.count = 0; |
| 440 | 440 | ||
| 441 | if (pledge("stdio inet dns rpath wpath cpath proc flock tty dns", NULL) == -1) { | 441 | if (pledge("stdio inet dns rpath wpath cpath proc flock tty", NULL) == -1) { |
| 442 | fprintf(stderr, "openssl: pledge: %s\n", strerror(errno)); | 442 | fprintf(stderr, "openssl: pledge: %s\n", strerror(errno)); |
| 443 | exit(1); | 443 | exit(1); |
| 444 | } | 444 | } |
diff --git a/src/usr.bin/openssl/s_client.c b/src/usr.bin/openssl/s_client.c index ae86a7c85e..471a5e3c5c 100644 --- a/src/usr.bin/openssl/s_client.c +++ b/src/usr.bin/openssl/s_client.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s_client.c,v 1.26 2015/12/01 01:24:47 beck Exp $ */ | 1 | /* $OpenBSD: s_client.c,v 1.27 2015/12/01 12:01:56 jca 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 | * |
| @@ -365,7 +365,7 @@ s_client_main(int argc, char **argv) | |||
| 365 | long socket_mtu = 0; | 365 | long socket_mtu = 0; |
| 366 | 366 | ||
| 367 | if (single_execution) { | 367 | if (single_execution) { |
| 368 | if (pledge("stdio inet dns rpath wpath cpath tty dns", NULL) == -1) { | 368 | if (pledge("stdio inet dns rpath wpath cpath tty", NULL) == -1) { |
| 369 | perror("pledge"); | 369 | perror("pledge"); |
| 370 | exit(1); | 370 | exit(1); |
| 371 | } | 371 | } |