security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-05 12:31:50 +01:00
Code Activity

gpg: Let only Dirmngr decide whether CERT is supported.

Browse Source 
* 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 <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-12-01 13:08:02 +01:00
parent fbdfe6a514
commit 86efc3ee53
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
g10/getkey.c
View File

@ -4153,10 +4153,8 @@ parse_auto_key_locate (char *options)
akl->type = AKL_LDAP; akl->type = AKL_LDAP;
else if (ascii_strcasecmp (tok, "keyserver") == 0) else if (ascii_strcasecmp (tok, "keyserver") == 0)
akl->type = AKL_KEYSERVER; akl->type = AKL_KEYSERVER;
#ifdef USE_DNS_CERT
else if (ascii_strcasecmp (tok, "cert") == 0) else if (ascii_strcasecmp (tok, "cert") == 0)
akl->type = AKL_CERT; akl->type = AKL_CERT;
#endif
else if (ascii_strcasecmp (tok, "pka") == 0) else if (ascii_strcasecmp (tok, "pka") == 0)
akl->type = AKL_PKA; akl->type = AKL_PKA;
else if (ascii_strcasecmp (tok, "dane") == 0) else if (ascii_strcasecmp (tok, "dane") == 0)

4
g10/keyserver.c
View File

@ -2084,11 +2084,9 @@ keyserver_import_ldap (ctrl_t ctrl,
struct keyserver_spec *keyserver; struct keyserver_spec *keyserver;
strlist_t list=NULL; strlist_t list=NULL;
int rc,hostlen=1; int rc,hostlen=1;
#ifdef USE_DNS_SRV
struct srventry *srvlist=NULL; struct srventry *srvlist=NULL;
int srvcount,i; int srvcount,i;
char srvname[MAXDNAME]; char srvname[MAXDNAME];
#endif
/* Parse out the domain */ /* Parse out the domain */
domain=strrchr(name,'@'); domain=strrchr(name,'@');
@ -2102,7 +2100,6 @@ keyserver_import_ldap (ctrl_t ctrl,
keyserver->host=xmalloc(1); keyserver->host=xmalloc(1);
keyserver->host[0]='\0'; keyserver->host[0]='\0';
#ifdef USE_DNS_SRV
snprintf(srvname,MAXDNAME,"_pgpkey-ldap._tcp.%s",domain); snprintf(srvname,MAXDNAME,"_pgpkey-ldap._tcp.%s",domain);
FIXME("network related - move to dirmngr or drop the code"); FIXME("network related - move to dirmngr or drop the code");
@ -2130,7 +2127,6 @@ keyserver_import_ldap (ctrl_t ctrl,
} }
free(srvlist); free(srvlist);
#endif
/* If all else fails, do the PGP Universal trick of /* If all else fails, do the PGP Universal trick of
ldap://keys.(domain) */ ldap://keys.(domain) */