diff options
| author | Werner Koch <wk@gnupg.org> | 2015-10-18 20:07:44 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2015-10-18 20:08:26 +0200 |
| commit | 5aa1b392b1bf6fcf4cd380862c5affac39a4f34d (patch) | |
| tree | 882c4f557c37121a3bfa23bc1afaf60c6bc18cc5 /dirmngr/dirmngr.h | |
| parent | g10: Fix assert. (diff) | |
| download | gnupg2-5aa1b392b1bf6fcf4cd380862c5affac39a4f34d.tar.xz gnupg2-5aa1b392b1bf6fcf4cd380862c5affac39a4f34d.zip | |
Move http module from common/ to dirmngr/.
* common/http.c: Move to ../dirmngr/.
* common/http.h: Move to ../dirmngr/.
* common/t-http.c: Move to ../dirmngr/.
* common/tls-ca.pem: Move to ../dirmngr/.
* common/Makefile.am: Do not build libcommontls.a libcommontlsnpth.a.
Remove http.c related stuff.
* po/POTFILES.in: Move http.c to dirmngr/.
* dirmngr/Makefile.am (EXTRA_DIST): Add tls-ca.pem.
(module_maint_tests): New.
(noinst_PROGRAMS): Add module_maint_tests.
(dirmngr_SOURCES): Add http.c and http.h.
(dirmngr_LDADD): Remove libcommontlsnpth.
(t_common_ldadd): Ditto.
(t_http_SOURCES, t_http_CFLAGS, t_http_LDADD): New.
(t_ldap_parse_uri_SOURCES): Add http.c.
(t_ldap_parse_uri_CFLAGS): Build without npth.
($(PROGRAMS)): Do not require libcommontls.a libcommontlsnpth.a.
* dirmngr/dirmngr.h, dirmngr/ks-engine.h: Fix include of http.h.
--
All network access is done via dirmngr and thus http.c should be
there.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'dirmngr/dirmngr.h')
| -rw-r--r-- | dirmngr/dirmngr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h index b2b94f9c8..dff902aa5 100644 --- a/dirmngr/dirmngr.h +++ b/dirmngr/dirmngr.h @@ -33,7 +33,7 @@ #include "../common/membuf.h" #include "../common/sysutils.h" /* (gnupg_fd_t) */ #include "../common/i18n.h" -#include "../common/http.h" /* (parsed_uri_t) */ +#include "http.h" /* (parsed_uri_t) */ /* This objects keeps information about a particular LDAP server and is used as item of a single linked list of servers. */ |