mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
dirmngr: Support "ldap:///" for the current AD user.
* dirmngr/http.h (struct parsed_uri_s): Add field ad_current. * dirmngr/ldap-parse-uri.c (ldap_parse_uri): Set it. * dirmngr/ks-engine-ldap.c (my_ldap_connect): Take care of ad_current. -- Ported from 2.2. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
2cadcce3e8
commit
1194e4f7e2
3 changed files with 54 additions and 15 deletions
|
@ -163,9 +163,21 @@ ldap_parse_uri (parsed_uri_t *purip, const char *uri)
|
|||
puri->query->valuelen = strlen (password) + 1;
|
||||
}
|
||||
|
||||
puri->use_tls = strcmp (puri->scheme, "ldaps") == 0;
|
||||
puri->use_tls = !strcmp (puri->scheme, "ldaps");
|
||||
puri->port = lud->lud_port;
|
||||
|
||||
/* On Windows detect whether this is ldap:// or ldaps:// to indicate
|
||||
* that authentication via AD and the current user is requested. */
|
||||
puri->ad_current = 0;
|
||||
#ifdef HAVE_W32_SYSTEM
|
||||
if ((!puri->host || !*puri->host)
|
||||
&& (!puri->path || !*puri->path)
|
||||
&& (!puri->auth || !*puri->auth)
|
||||
&& !password
|
||||
)
|
||||
puri->ad_current = 1;
|
||||
#endif
|
||||
|
||||
out:
|
||||
if (lud)
|
||||
ldap_free_urldesc (lud);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue