From 109080ae48441256cc6702472eb5593183f1232d Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Sun, 3 Jul 2005 13:10:45 +0000 Subject: [PATCH] Fix bugs in bug-fix to x509/by_dir.c. PR: 1131 --- crypto/x509/by_dir.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c index b4a21716f2..ea689aed1a 100644 --- a/crypto/x509/by_dir.c +++ b/crypto/x509/by_dir.c @@ -122,19 +122,18 @@ static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl, { case X509_L_ADD_DIR: if (argl == X509_FILETYPE_DEFAULT) + { dir=(char *)Getenv(X509_get_default_cert_dir_env()); if (dir) - ret=add_cert_dir(ld,dir,X509_FILETYPE_PEM); + ret=add_cert_dir(ld,dir,X509_FILETYPE_PEM); else - { - ret=add_cert_dir(ld,X509_get_default_cert_dir(), - X509_FILETYPE_PEM); - } + ret=add_cert_dir(ld,X509_get_default_cert_dir(), + X509_FILETYPE_PEM); if (!ret) { X509err(X509_F_DIR_CTRL,X509_R_LOADING_CERT_DIR); } - + } else ret=add_cert_dir(ld,argp,(int)argl); break; -- 2.25.1