Fix bugs in bug-fix to x509/by_dir.c [from HEAD].

PR: 1131

diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index b4a21716f213321348c86f016fbf652e6a1dd339..ea689aed1a2518bf4f02952db1dd0992698b8810 100644 (file)
--- 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;