From 52cf32ce2f904b2e6f53f406a90458f6ef148af9 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 26 May 2021 15:49:14 +0200 Subject: dirmngr: New option --ldapserver * dirmngr/dirmngr.c (opts): Add option --ldapserver. (ldapserver_list_needs_reset): New var. (parse_rereadable_options): Implement option. (main): Ignore dirmngr_ldapservers.conf if no --ldapserver is used. * dirmngr/server.c (cmd_ldapserver): Add option --clear and list configured servers if none are given. -- This option allows to specify LDAP keyserver in dirmngr instead of using gpgsm.conf. Signed-off-by: Werner Koch (cherry picked from commit ff17aee5d10c8c5ab902253fb4332001c3fc3701) --- dirmngr/ks-engine-ldap.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'dirmngr/ks-engine-ldap.c') diff --git a/dirmngr/ks-engine-ldap.c b/dirmngr/ks-engine-ldap.c index 1b5c2ca32..dcd581c28 100644 --- a/dirmngr/ks-engine-ldap.c +++ b/dirmngr/ks-engine-ldap.c @@ -516,7 +516,9 @@ my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp, const char *bindname; const char *password; const char *basedn_arg; +#ifndef HAVE_W32_SYSTEM char *tmpstr; +#endif if (r_basedn) *r_basedn = NULL; -- cgit v1.2.3