import of openssl-0.9.7j

1 files changed, 7 insertions, 8 deletions

diff --git a/src/lib/libcrypto/x509/by_dir.c b/src/lib/libcrypto/x509/by_dir.c
index 6207340472..ea689aed1a 100644
--- a/src/lib/libcrypto/x509/by_dir.c
+++ b/src/lib/libcrypto/x509/by_dir.c
@@ -114,7 +114,7 @@ static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
         {
         int ret=0;
         BY_DIR *ld;
-        char *dir;
+        char *dir = NULL;
 
         ld=(BY_DIR *)ctx->method_data;
 
@@ -123,17 +123,16 @@ static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
         case X509_L_ADD_DIR:
                 if (argl == X509_FILETYPE_DEFAULT)
                         {
-                        ret=add_cert_dir(ld,X509_get_default_cert_dir(),
-                                X509_FILETYPE_PEM);
+                        dir=(char *)Getenv(X509_get_default_cert_dir_env());
+                        if (dir)
+                                ret=add_cert_dir(ld,dir,X509_FILETYPE_PEM);
+                        else
+                                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
-                                {
-                                dir=(char *)Getenv(X509_get_default_cert_dir_env());
-                                ret=add_cert_dir(ld,dir,X509_FILETYPE_PEM);
-                                }
                         }
                 else
                         ret=add_cert_dir(ld,argp,(int)argl);