security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

doc: Document gpgsm's --keyserver option. 

--

Also fix a few related entries.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2019-11-07 17:41:19 +01:00
parent eae1ea6f39
commit 2b9d399cf0
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dirmngr/ldapserver.c
View File

@ -48,7 +48,7 @@ ldapserver_list_free (ldap_server_t servers)
/* Parse a single LDAP server configuration line. Returns the server /* Parse a single LDAP server configuration line. Returns the server
or NULL in case of errors. The configuration line is assumed to be 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 1. field: Hostname
2. field: Portnumber 2. field: Portnumber

7
doc/dirmngr.texi
View File

@ -399,9 +399,10 @@ configured LDAP server if the connection using the "proxy" failed.
@item --ldapserverlist-file @var{file} @item --ldapserverlist-file @var{file}
@opindex ldapserverlist-file @opindex ldapserverlist-file
Read the list of LDAP servers to consult for CRLs and certificates from Read a list of LDAP servers to consult for CRLs and certificates from
file instead of the default per-user ldap server list file. The default file. This servers from this list are used after any servers set by a
value for @var{file} is @file{dirmngr_ldapservers.conf}. 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 This server list file contains one LDAP server per line in the format

16
doc/gpgsm.texi
View File

@ -347,6 +347,22 @@ Outputs additional information while running.
You can increase the verbosity by giving several You can increase the verbosity by giving several
verbose commands to @command{gpgsm}, such as @samp{-vv}. 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} @item --policy-file @var{filename}
@opindex policy-file @opindex policy-file
Change the default name of the policy file to @var{filename}. The Change the default name of the policy file to @var{filename}. The