From f8b1b7b4df86de86c28721aef2b2b70b79c6df91 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 14 Oct 2024 16:46:27 +0200
Subject: [PATCH] dirmngr: Print a brief list of URLs with LISTCRLS.

* dirmngr/crlcache.c (crl_cache_list): Print a summary of URLs.

* sm/call-dirmngr.c (gpgsm_dirmngr_run_command): Print a notice to
stdout if the dirmngr has been disabled.
--

GnuPG-bug-id: 7337
---
 NEWS               | 2 ++
 dirmngr/crlcache.c | 5 +++++
 sm/call-dirmngr.c  | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/NEWS b/NEWS
index 32315ab01..cebb2e6d0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 Noteworthy changes in version 2.5.2 (unreleased)
 ------------------------------------------------
 
+  * dirmngr: A list of used URLs for loaded CRLs is printed first in
+    the output of the LISTCRL command.  [T7337]
 
   See-also: gnupg-announce/2024q4/000xxx.html
   Release-info: https://dev.gnupg.org/T7289
diff --git a/dirmngr/crlcache.c b/dirmngr/crlcache.c
index d3fe5c272..824775483 100644
--- a/dirmngr/crlcache.c
+++ b/dirmngr/crlcache.c
@@ -2645,6 +2645,11 @@ crl_cache_list (estream_t fp)
   crl_cache_entry_t entry;
   gpg_error_t err = 0;
 
+  for (entry = cache->entries;
+       entry && !entry->deleted;
+       entry = entry->next )
+      es_fprintf (fp, "URL: %s\n", entry->url );
+
   for (entry = cache->entries;
        entry && !entry->deleted && !err;
        entry = entry->next )
diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c
index 22580bd12..338793068 100644
--- a/sm/call-dirmngr.c
+++ b/sm/call-dirmngr.c
@@ -1143,6 +1143,8 @@ gpgsm_dirmngr_run_command (ctrl_t ctrl, const char *command,
   struct run_command_parm_s parm;
 
   rc = start_dirmngr (ctrl);
+  if (gpg_err_code (rc) == GPG_ERR_NO_DIRMNGR)
+    fputs (_("no dirmngr running in this session\n"), stdout);
   if (rc)
     return rc;