diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-07-03 13:15:53 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-07-03 13:15:53 +0000 |
| commit | 2e39604021d38de29cc451699e0a2aceb0a74f59 (patch) | |
| tree | 1afed7677db7c17bfc8fac764472e2960146b541 /crypto/x509 | |
| parent | fbfb947b21358b8be9459c4962e0f9f35227c286 (diff) | |
Fix bugs in bug-fix to x509/by_dir.c [from HEAD].
PR: 1131
Diffstat (limited to 'crypto/x509')
| -rw-r--r-- | crypto/x509/by_dir.c | 11 |
1 files 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; |