From 14528ec66bd7dce28c7540fa9a34f35de54261c1 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 9 Jun 2021 10:23:42 +0200 Subject: [PATCH] dirmngr: Allow to pass no filter args to dirmngr_ldap. * dirmngr/dirmngr_ldap.c (main): Handle no args case. -- This is required for example for CRLs. The old code did not require this because the hos was taken from the URL given has arg. Signed-off-by: Werner Koch (cherry picked from commit f6e45671aa26f3e7abb968a876de7bbdb4fca3f1) --- dirmngr/dirmngr_ldap.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c index ba256a877..9c9fcc508 100644 --- a/dirmngr/dirmngr_ldap.c +++ b/dirmngr/dirmngr_ldap.c @@ -296,8 +296,6 @@ main (int argc, char **argv) if (log_get_errorcount (0)) exit (2); - if (argc < 1) - gpgrt_usage (1); if (opt.alarm_timeout) { @@ -320,9 +318,17 @@ main (int argc, char **argv) any_err = 1; else { - for (; argc; argc--, argv++) - if (process_filter (ld, *argv)) - any_err = 1; + if (!argc) + { + if (process_filter (ld, "(objectClass=*)")) + any_err = 1; + } + else + { + for (; argc; argc--, argv++) + if (process_filter (ld, *argv)) + any_err = 1; + } ldap_unbind (ld); }