diff options
| author | Werner Koch <[email protected]> | 2016-12-01 12:08:02 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-12-01 15:40:32 +0000 |
| commit | 86efc3ee53abaf1e22b53c1b360c51829e476115 (patch) | |
| tree | d7ffb6b1142f343e8fb01b7043d4b495bb7a927c /g10/keyserver.c | |
| parent | tests,build: Fix distcheck. (diff) | |
| download | gnupg-86efc3ee53abaf1e22b53c1b360c51829e476115.tar.gz gnupg-86efc3ee53abaf1e22b53c1b360c51829e476115.zip | |
gpg: Let only Dirmngr decide whether CERT is supported.
* g10/getkey.c (parse_auto_key_locate): Do not build parts depending
on USE_DNS_CERT.
--
This also removes USE_DNS_SRV from commented code.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/keyserver.c')
| -rw-r--r-- | g10/keyserver.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c index 9148e7d97..c7363c98f 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -2084,11 +2084,9 @@ keyserver_import_ldap (ctrl_t ctrl, struct keyserver_spec *keyserver; strlist_t list=NULL; int rc,hostlen=1; -#ifdef USE_DNS_SRV struct srventry *srvlist=NULL; int srvcount,i; char srvname[MAXDNAME]; -#endif /* Parse out the domain */ domain=strrchr(name,'@'); @@ -2102,7 +2100,6 @@ keyserver_import_ldap (ctrl_t ctrl, keyserver->host=xmalloc(1); keyserver->host[0]='\0'; -#ifdef USE_DNS_SRV snprintf(srvname,MAXDNAME,"_pgpkey-ldap._tcp.%s",domain); FIXME("network related - move to dirmngr or drop the code"); @@ -2130,7 +2127,6 @@ keyserver_import_ldap (ctrl_t ctrl, } free(srvlist); -#endif /* If all else fails, do the PGP Universal trick of ldap://keys.(domain) */ |