diff options
| author | Werner Koch <[email protected]> | 2015-10-22 07:22:41 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-10-22 07:22:41 +0000 |
| commit | 41bb01ae792af78edd28bf1b735cacc0b3ac428a (patch) | |
| tree | ed764c6b22ac1bee077d3b99bc41bc072ff01c34 /g10/keyserver.c | |
| parent | dirmngr: Use the new DNS wrapper for the HTTP module. (diff) | |
| download | gnupg-41bb01ae792af78edd28bf1b735cacc0b3ac428a.tar.gz gnupg-41bb01ae792af78edd28bf1b735cacc0b3ac428a.zip | |
Move SRV RR code from common/ to dirmngr/.
* common/srv.c: Merge into dirmngr/dns-stuff.c. Delete file.
* common/srv.h: Merge into dirmngr/dns-stuff.h. Delete file.
* common/Makefile.am (common_sources): Remove srv.c and srv.h.
* g10/keyserver.c: Do not include srv.h. The code using it is anyway
disabled.
* dirmngr/http.c: Remove header srv.h and stubs.
* dirmngr/t-dns-stuff.c: Add option --srv.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/keyserver.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c index a6257e539..37e62fd18 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -41,9 +41,6 @@ #include "trustdb.h" #include "keyserver-internal.h" #include "util.h" -#ifdef USE_DNS_SRV -#include "srv.h" -#endif #include "membuf.h" #include "call-dirmngr.h" @@ -2029,6 +2026,7 @@ keyserver_import_ldap (ctrl_t ctrl, #ifdef USE_DNS_SRV snprintf(srvname,MAXDNAME,"_pgpkey-ldap._tcp.%s",domain); + FIXME("network related - move to dirmngr or drop the code"); srvcount=getsrv(srvname,&srvlist); for(i=0;i<srvcount;i++) |