mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Merge branch 'STABLE-BRANCH-2-4'
-- Resolved conflicts: NEWS common/exechelp-w32.c configure.ac
This commit is contained in:
commit
4485930f9f
103 changed files with 1485 additions and 1135 deletions
|
@ -607,7 +607,7 @@ interrogate_ldap_dn (LDAP *ldap_conn, const char *basedn_search,
|
|||
* including whether to use TLS and the username and password (see
|
||||
* ldap_parse_uri for a description of the various fields). Be
|
||||
* default a PGP keyserver is assumed; if GENERIC is true a generic
|
||||
* ldap conenction is instead established.
|
||||
* ldap connection is instead established.
|
||||
*
|
||||
* Returns: The ldap connection handle in *LDAP_CONNP, R_BASEDN is set
|
||||
* to the base DN for the PGP key space, several flags will be stored
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue