[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.10-12-g01baee2

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-2 has been updated
       via  01baee2b0ef4f81ac6ffa55480e91168dd27b430 (commit)
      from  6b36c16f77722d17f4f317c788701cbc1e9552b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 01baee2b0ef4f81ac6ffa55480e91168dd27b430
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 24 09:17:39 2018 +0200

    dirmngr: Only print info for no ldapserver file
    
    * dirmngr/dirmngr.c (parse_ldapserver_file): Only print info
    for ENOENT.
    
    --
    It is very common that there is no ldapserver file. In that
    case users are confused by an error printed at dirmngr startup.

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 5965f84..55c7a49 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -1629,7 +1629,11 @@ parse_ldapserver_file (const char* filename)
   fp = es_fopen (filename, "r");
   if (!fp)
     {
-      log_error (_("error opening '%s': %s\n"), filename, strerror (errno));
+      if (errno == ENOENT)
+        log_info ("No ldapserver file at: '%s'\n", filename);
+      else
+        log_error (_("error opening '%s': %s\n"), filename,
+                   strerror (errno));
       return NULL;
     }
 

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

Summary of changes:
 dirmngr/dirmngr.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org