Fix bugs in bug-fix to x509/by_dir.c [from HEAD].
authorAndy Polyakov <appro@openssl.org>
Sun, 3 Jul 2005 13:15:53 +0000 (13:15 +0000)
committerAndy Polyakov <appro@openssl.org>
Sun, 3 Jul 2005 13:15:53 +0000 (13:15 +0000)
PR: 1131

crypto/x509/by_dir.c

index b4a2171..ea689ae 100644 (file)
@@ -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;