diff options
| -rw-r--r-- | dirmngr/ldapserver.c | 2 | ||||
| -rw-r--r-- | doc/dirmngr.texi | 7 | ||||
| -rw-r--r-- | doc/gpgsm.texi | 16 |
3 files changed, 21 insertions, 4 deletions
diff --git a/dirmngr/ldapserver.c b/dirmngr/ldapserver.c index 16e13e2fe..913e94f16 100644 --- a/dirmngr/ldapserver.c +++ b/dirmngr/ldapserver.c @@ -48,7 +48,7 @@ ldapserver_list_free (ldap_server_t servers) /* Parse a single LDAP server configuration line. Returns the server or NULL in case of errors. The configuration line is assumed to be - colon seprated with these fields: + colon separated with these fields: 1. field: Hostname 2. field: Portnumber diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi index eb9a92160..c841de77e 100644 --- a/doc/dirmngr.texi +++ b/doc/dirmngr.texi @@ -399,9 +399,10 @@ configured LDAP server if the connection using the "proxy" failed. @item --ldapserverlist-file @var{file} @opindex ldapserverlist-file -Read the list of LDAP servers to consult for CRLs and certificates from -file instead of the default per-user ldap server list file. The default -value for @var{file} is @file{dirmngr_ldapservers.conf}. +Read a list of LDAP servers to consult for CRLs and certificates from +file. This servers from this list are used after any servers set by a +client for its session. The default value for @var{file} is +@file{dirmngr_ldapservers.conf}. This server list file contains one LDAP server per line in the format diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi index ecc43cd3c..0745f8626 100644 --- a/doc/gpgsm.texi +++ b/doc/gpgsm.texi @@ -347,6 +347,22 @@ Outputs additional information while running. You can increase the verbosity by giving several verbose commands to @command{gpgsm}, such as @samp{-vv}. + +@item --keyserver @var{string} +@opindex keyserver +Add an LDAP server to use for certificate and CRL lookup. This option +can be given multiple times to configure more than one LDAP server. +Note that the @command{dirmngr} can in addition be configured with a +default list of LDAP servers to be used after those configured with +this option. The syntax of @var{string} is: + +@sc{hostname:port:username:password:base_dn} + +Note that all parts of that string are expected to be UTF-8 encoded. +This may lead to problems if the @sc{password} has originally been +encoded as Latin-1; in such a case better configure this LDAP server +using the global configuration of @command{dirmngr}. + @item --policy-file @var{filename} @opindex policy-file Change the default name of the policy file to @var{filename}. The |