summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2016-08-31 11:42:10 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2016-08-31 11:42:10 +0000
commit82406a9fa77a47603a26f59358ba4272ce90ff42 (patch)
treec9f3d8a77f7f406de13811709095137f33b226d5
parent3c0d1e4a4cf3182e8efde90f8883faa43a9a6c49 (diff)
We don't need any VMS access tricks.
ok beck tedu
-rw-r--r--usr.bin/openssl/ca.c31
1 files changed, 4 insertions, 27 deletions
diff --git a/usr.bin/openssl/ca.c b/usr.bin/openssl/ca.c
index 206dd75efd7..04d7c5ceaac 100644
--- a/usr.bin/openssl/ca.c
+++ b/usr.bin/openssl/ca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ca.c,v 1.21 2016/08/30 11:32:28 deraadt Exp $ */
+/* $OpenBSD: ca.c,v 1.22 2016/08/31 11:42:09 deraadt Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -702,34 +702,11 @@ bad:
/*****************************************************************/
/* lookup where to write new certificates */
- if ((outdir == NULL) && (req)) {
-
+ if (outdir == NULL && req) {
if ((outdir = NCONF_get_string(conf, section,
ENV_NEW_CERTS_DIR)) == NULL) {
- BIO_printf(bio_err, "there needs to be defined a directory for new certificate to be placed in\n");
- goto err;
- }
- /*
- * outdir is a directory spec, but access() for VMS demands a
- * filename. In any case, stat(), below, will catch the
- * problem if outdir is not a directory spec, and the fopen()
- * or open() will catch an error if there is no write access.
- *
- * Presumably, this problem could also be solved by using the
- * DEC C routines to convert the directory syntax to Unixly,
- * and give that to access(). However, time's too short to
- * do that just now.
- */
- if (access(outdir, R_OK | W_OK | X_OK) != 0) {
- BIO_printf(bio_err,
- "I am unable to access the %s directory\n", outdir);
- perror(outdir);
- goto err;
- }
- if (app_isdir(outdir) <= 0) {
- BIO_printf(bio_err,
- "%s need to be a directory\n", outdir);
- perror(outdir);
+ BIO_printf(bio_err, "output directory %s not defined\n",
+ ENV_NEW_CERTS_DIR);
goto err;
}
}