diff options
| author | deraadt <> | 2016-08-31 11:42:09 +0000 |
|---|---|---|
| committer | deraadt <> | 2016-08-31 11:42:09 +0000 |
| commit | 52b6b4e032661e7c48d3ed341e13fe3e2cb4e454 (patch) | |
| tree | 9ade600bd9fb15ea4461a74b681770ab22c15560 | |
| parent | eef10b416862b4920a59237babe254fb5ab98c68 (diff) | |
| download | openbsd-52b6b4e032661e7c48d3ed341e13fe3e2cb4e454.tar.gz openbsd-52b6b4e032661e7c48d3ed341e13fe3e2cb4e454.tar.bz2 openbsd-52b6b4e032661e7c48d3ed341e13fe3e2cb4e454.zip | |
We don't need any VMS access tricks.
ok beck tedu
Diffstat (limited to '')
| -rw-r--r-- | src/usr.bin/openssl/ca.c | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/src/usr.bin/openssl/ca.c b/src/usr.bin/openssl/ca.c index 206dd75efd..04d7c5ceaa 100644 --- a/src/usr.bin/openssl/ca.c +++ b/src/usr.bin/openssl/ca.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ca.c,v 1.21 2016/08/30 11:32:28 deraadt Exp $ */ | 1 | /* $OpenBSD: ca.c,v 1.22 2016/08/31 11:42:09 deraadt 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 | * |
| @@ -702,34 +702,11 @@ bad: | |||
| 702 | 702 | ||
| 703 | /*****************************************************************/ | 703 | /*****************************************************************/ |
| 704 | /* lookup where to write new certificates */ | 704 | /* lookup where to write new certificates */ |
| 705 | if ((outdir == NULL) && (req)) { | 705 | if (outdir == NULL && req) { |
| 706 | |||
| 707 | if ((outdir = NCONF_get_string(conf, section, | 706 | if ((outdir = NCONF_get_string(conf, section, |
| 708 | ENV_NEW_CERTS_DIR)) == NULL) { | 707 | ENV_NEW_CERTS_DIR)) == NULL) { |
| 709 | BIO_printf(bio_err, "there needs to be defined a directory for new certificate to be placed in\n"); | 708 | BIO_printf(bio_err, "output directory %s not defined\n", |
| 710 | goto err; | 709 | ENV_NEW_CERTS_DIR); |
| 711 | } | ||
| 712 | /* | ||
| 713 | * outdir is a directory spec, but access() for VMS demands a | ||
| 714 | * filename. In any case, stat(), below, will catch the | ||
| 715 | * problem if outdir is not a directory spec, and the fopen() | ||
| 716 | * or open() will catch an error if there is no write access. | ||
| 717 | * | ||
| 718 | * Presumably, this problem could also be solved by using the | ||
| 719 | * DEC C routines to convert the directory syntax to Unixly, | ||
| 720 | * and give that to access(). However, time's too short to | ||
| 721 | * do that just now. | ||
| 722 | */ | ||
| 723 | if (access(outdir, R_OK | W_OK | X_OK) != 0) { | ||
| 724 | BIO_printf(bio_err, | ||
| 725 | "I am unable to access the %s directory\n", outdir); | ||
| 726 | perror(outdir); | ||
| 727 | goto err; | ||
| 728 | } | ||
| 729 | if (app_isdir(outdir) <= 0) { | ||
| 730 | BIO_printf(bio_err, | ||
| 731 | "%s need to be a directory\n", outdir); | ||
| 732 | perror(outdir); | ||
| 733 | goto err; | 710 | goto err; |
| 734 | } | 711 | } |
| 735 | } | 712 | } |
