diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/dirmngr.texi | 6 | ||||
| -rw-r--r-- | doc/gpgsm.texi | 18 |
2 files changed, 21 insertions, 3 deletions
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi index c841de77e..a6fafbb14 100644 --- a/doc/dirmngr.texi +++ b/doc/dirmngr.texi @@ -406,10 +406,14 @@ client for its session. The default value for @var{file} is This server list file contains one LDAP server per line in the format -@sc{hostname:port:username:password:base_dn} +@sc{hostname:port:username:password:base_dn:flags} Lines starting with a @samp{#} are comments. +The only defined flag is @code{ldaps} to specify that a TLS +connections shall be used. Flags are comma delimited; unknown flags +are ignored. + Note that as usual all strings entered are expected to be UTF-8 encoded. Obviously this will lead to problems if the password has originally been encoded as Latin-1. There is no other solution here than to put such a diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi index 0745f8626..130b217a5 100644 --- a/doc/gpgsm.texi +++ b/doc/gpgsm.texi @@ -356,13 +356,27 @@ 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} +@sc{hostname:port:username:password:base_dn:flags} + +The only defined flag is @code{ldaps} to specify that a TLS +connections shall be used. Flags are comma delimited; unknown flags +are ignored. 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 +encoded as Latin-1; in such a case better configure tsuch an LDAP server using the global configuration of @command{dirmngr}. +Here is an example which uses the default port, no username, no +password, and requests a TLS connection: + +@c man:.RS +@example +--keyserver ldap.pca.dfn.de::::o=DFN-Verein,c=DE:ldaps +@end example +@c man:.RE + + @item --policy-file @var{filename} @opindex policy-file Change the default name of the policy file to @var{filename}. The |