1 files changed, 3 insertions, 9 deletions

diff --git a/src/lib/libcrypto/x509/by_dir.c b/src/lib/libcrypto/x509/by_dir.c
index 032210424d..7b7d14a950 100644
--- a/src/lib/libcrypto/x509/by_dir.c
+++ b/src/lib/libcrypto/x509/by_dir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: by_dir.c,v 1.36 2015/02/12 03:54:07 jsing Exp $ */
+/* $OpenBSD: by_dir.c,v 1.37 2015/04/11 16:03:21 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -124,20 +124,14 @@ dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
 {
         int ret = 0;
         BY_DIR *ld;
-        char *dir = NULL;
 
         ld = (BY_DIR *)ctx->method_data;
 
         switch (cmd) {
         case X509_L_ADD_DIR:
                 if (argl == X509_FILETYPE_DEFAULT) {
-                        if (issetugid() == 0)
-                                dir = 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);
+                        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);
                         }