[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.11-2-g00321a0

[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  00321a025f90990a71b60b4689ede1f38fbde347 (commit)
      from  10157b41793247baa9c42c0450da146241a2c7b5 (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 00321a025f90990a71b60b4689ede1f38fbde347
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Oct 24 10:40:42 2018 +0200

    dirmngr: Add FLUSHCRLs command
    
    Summary:
    * dirmngr/crlcache.c (crl_cache_flush): Also deinit the cache.
    * dirmngr/server.c (hlp_flushcrls, cmd_flushcrls): New.
    (register_commands): Add FLUSHCRLS.
    
    --
    This allows it to flush the CRL cache of a running dirmngr
    server. This can be useful to debug / analyze CRL issues.
    
    GnuPG-Bug-Id: T3967
    
    Differential Revision: https://dev.gnupg.org/D469
    
    Signed-off-by: Andre Heinecke <aheinecke at intevation.de>

diff --git a/dirmngr/crlcache.c b/dirmngr/crlcache.c
index 0b2fe16..52f49c0 100644
--- a/dirmngr/crlcache.c
+++ b/dirmngr/crlcache.c
@@ -1250,13 +1250,15 @@ crl_cache_deinit (void)
 }
 
 
-/* Delete the cache from disk. Return 0 on success.*/
+/* Delete the cache from disk and memory. Return 0 on success.*/
 int
 crl_cache_flush (void)
 {
   int rc;
 
+  crl_cache_deinit ();
   rc = cleanup_cache_dir (0)? -1 : 0;
+  crl_cache_init ();
 
   return rc;
 }
diff --git a/dirmngr/server.c b/dirmngr/server.c
index d414c0e..272b95a 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -2689,6 +2689,20 @@ cmd_reloaddirmngr (assuan_context_t ctx, char *line)
 }
 
 
+static const char hlp_flushcrls[] =
+  "FLUSHCRLS\n"
+  "\n"
+  "Remove all cached CRLs from memory and\n"
+  "the file system.";
+static gpg_error_t
+cmd_flushcrls (assuan_context_t ctx, char *line)
+{
+  (void)line;
+
+  return leave_cmd (ctx, crl_cache_flush () ? GPG_ERR_GENERAL : 0);
+}
+
+
 

 /* Tell the assuan library about our commands. */
 static int
@@ -2719,6 +2733,7 @@ register_commands (assuan_context_t ctx)
     { "LOADSWDB",   cmd_loadswdb,   hlp_loadswdb },
     { "KILLDIRMNGR",cmd_killdirmngr,hlp_killdirmngr },
     { "RELOADDIRMNGR",cmd_reloaddirmngr,hlp_reloaddirmngr },
+    { "FLUSHCRLS",  cmd_flushcrls,  hlp_flushcrls },
     { NULL, NULL }
   };
   int i, j, rc;

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

Summary of changes:
 dirmngr/crlcache.c |  4 +++-
 dirmngr/server.c   | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)


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