gpg: Allow --locate-external-key even with --no-auto-key-locate.

* g10/getkey.c (akl_empty_or_only_local): New.
* g10/gpg.c (DEFAULT_AKL_LIST): New.
(main): Use it here.
(main) <aLocateExtKeys>: Set default AKL if none is set.
--

This better matches the expectations of the user.  The used list in
this case is the default list ("local,wkd") with local ignored by the
command anyway.

GnuPG-bug-id: 4662
Signed-off-by: Werner Koch <[email protected]>

1 files changed, 20 insertions, 0 deletions

diff --git a/g10/getkey.c b/g10/getkey.c
index 57617a0a9..dc3dc4844 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -3922,6 +3922,26 @@ release_akl (void)
     }
 }
 
+
+/* Returns true if the AKL is empty or has only the local method
+ * active.  */
+int
+akl_empty_or_only_local (void)
+{
+  struct akl *akl;
+  int any = 0;
+
+  for (akl = opt.auto_key_locate; akl; akl = akl->next)
+    if (akl->type != AKL_NODEFAULT && akl->type != AKL_LOCAL)
+      {
+        any = 1;
+        break;
+      }
+
+  return !any;
+}
+
+
 /* Returns false on error. */
 int
 parse_auto_key_locate (const char *options_arg)