diff options
Diffstat (limited to 'dirmngr')
| -rw-r--r-- | dirmngr/dirmngr.c | 39 | ||||
| -rw-r--r-- | dirmngr/ks-engine-ldap.c | 2 | ||||
| -rw-r--r-- | dirmngr/server.c | 56 |
3 files changed, 91 insertions, 6 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 38ae1c6ed..ebb6ae08a 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -125,6 +125,7 @@ enum cmd_and_opt_values { oHTTPProxy, oLDAPProxy, oOnlyLDAPProxy, + oLDAPServer, oLDAPFile, oLDAPTimeout, oLDAPAddServers, @@ -260,6 +261,8 @@ static gpgrt_opt_t opts[] = { N_("|HOST|use HOST for LDAP queries")), ARGPARSE_s_n (oOnlyLDAPProxy, "only-ldap-proxy", N_("do not use fallback hosts with --ldap-proxy")), + ARGPARSE_s_s (oLDAPServer, "ldapserver", + N_("|SPEC|use this keyserver to lookup keys")), ARGPARSE_s_s (oLDAPFile, "ldapserverlist-file", N_("|FILE|read LDAP server list from FILE")), ARGPARSE_s_n (oLDAPAddServers, "add-servers", @@ -378,6 +381,11 @@ static int network_activity_seen; /* A list of filenames registered with --hkp-cacert. */ static strlist_t hkp_cacert_filenames; +/* A flag used to clear the list of ldapservers iff --ldapserver is + * given on the command line or one of the conf files. In this case we + * want to clear all old specifications through the legacy + * dirmngr_ldapservers.conf. */ +static int ldapserver_list_needs_reset; /* The timer tick used for housekeeping stuff. The second constant is used when a shutdown is pending. */ #define TIMERTICK_INTERVAL (60) @@ -671,6 +679,7 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread) set_dns_timeout (0); opt.connect_timeout = 0; opt.connect_quick_timeout = 0; + ldapserver_list_needs_reset = 1; return 1; } @@ -759,6 +768,30 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread) case oStandardResolver: enable_standard_resolver (1); break; case oRecursiveResolver: enable_recursive_resolver (1); break; + case oLDAPServer: + { + ldap_server_t server; + char *p; + + p = pargs->r.ret_str; + if (!strncmp (p, "ldap:", 5) && !(p[5] == '/' && p[6] == '/')) + p += 5; + + server = ldapserver_parse_one (p, NULL, 0); + if (server) + { + if (ldapserver_list_needs_reset) + { + ldapserver_list_needs_reset = 0; + ldapserver_list_free (opt.ldapservers); + opt.ldapservers = NULL; + } + server->next = opt.ldapservers; + opt.ldapservers = server; + } + } + break; + case oKeyServer: if (*pargs->r.ret_str) add_to_strlist (&opt.keyserver, pargs->r.ret_str); @@ -1133,9 +1166,11 @@ main (int argc, char **argv) if (cmd != aGPGConfTest && cmd != aGPGConfList && cmd != aGPGConfVersions) set_tor_mode (); - /* Get LDAP server list from file. */ + /* Get LDAP server list from file unless --ldapserver has been used. */ #if USE_LDAP - if (!ldapfile) + if (opt.ldapservers) + ; + else if (!ldapfile) { ldapfile = make_filename (gnupg_homedir (), "dirmngr_ldapservers.conf", 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; diff --git a/dirmngr/server.c b/dirmngr/server.c index 105275845..c5542fe6c 100644 --- a/dirmngr/server.c +++ b/dirmngr/server.c @@ -1140,11 +1140,13 @@ task_check_wkd_support (ctrl_t ctrl, const char *domain) static const char hlp_ldapserver[] = - "LDAPSERVER <data>\n" + "LDAPSERVER [--clear] <data>\n" "\n" "Add a new LDAP server to the list of configured LDAP servers.\n" "DATA is in the same format as expected in the configure file.\n" - "An optional prefix \"ldap:\" is allowed."; + "An optional prefix \"ldap:\" is allowed. With no args all\n" + "configured ldapservers are listed. Option --clear removes all\n" + "servers configured in this session."; static gpg_error_t cmd_ldapserver (assuan_context_t ctx, char *line) { @@ -1152,11 +1154,57 @@ cmd_ldapserver (assuan_context_t ctx, char *line) ctrl_t ctrl = assuan_get_pointer (ctx); ldap_server_t server; ldap_server_t *last_next_p; + int clear_flag; + clear_flag = has_option (line, "--clear"); + line = skip_options (line); while (spacep (line)) line++; - if (*line == '\0') - return leave_cmd (ctx, PARM_ERROR (_("ldapserver missing"))); + + if (clear_flag) + { +#if USE_LDAP + ldapserver_list_free (ctrl->server_local->ldapservers); +#endif /*USE_LDAP*/ + ctrl->server_local->ldapservers = NULL; + } + + if (!*line && clear_flag) + return leave_cmd (ctx, 0); + + if (!*line) + { + /* List all ldapservers. */ + struct ldapserver_iter ldapserver_iter; + char *tmpstr; + char portstr[20]; + + for (ldapserver_iter_begin (&ldapserver_iter, ctrl); + !ldapserver_iter_end_p (&ldapserver_iter); + ldapserver_iter_next (&ldapserver_iter)) + { + server = ldapserver_iter.server; + if (server->port) + snprintf (portstr, sizeof portstr, "%d", server->port); + else + *portstr = 0; + + tmpstr = xtryasprintf ("ldap:%s:%s:%s:%s:%s:%s%s:", + server->host? server->host : "", + portstr, + server->user? server->user : "", + server->pass? "[not_shown]": "", + server->base? server->base : "", + server->starttls ? "starttls" : + server->ldap_over_tls ? "ldaptls" : "none", + server->ntds ? ",ntds" : ""); + if (!tmpstr) + return leave_cmd (ctx, gpg_error_from_syserror ()); + dirmngr_status (ctrl, "LDAPSERVER", tmpstr, NULL); + xfree (tmpstr); + } + return leave_cmd (ctx, 0); + } /* Skip an "ldap:" prefix unless it is a valid ldap url. */ if (!strncmp (line, "ldap:", 5) && !(line[5] == '/' && line[6] == '/')) |