[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  ac454d8d4663e2fcf8a8437fab8aefd883091c37 (commit)
      from  c8f370485c43729db44b680e41e875ddd7f3108c (commit)


- Log -----------------------------------------------------------------
commit ac454d8d4663e2fcf8a8437fab8aefd883091c37
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Fri Sep 21 09:05:16 2018 +0200

    Make ca command silently use default if .attr file does not exist
    
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7286)

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/apps.c b/apps/apps.c
index 67d28ee..ed1b618 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1557,7 +1557,7 @@ CA_DB *load_index(const char *dbfile, DB_ATTR *db_attr)
 #else
     BIO_snprintf(buf, sizeof(buf), "%s-attr", dbfile);
 #endif
-    dbattr_conf = app_load_config(buf);
+    dbattr_conf = app_load_config_quiet(buf);
 
     retdb = app_malloc(sizeof(*retdb), "new DB");
     retdb->db = tmpdb;