diff options
| author | Werner Koch <wk@gnupg.org> | 2019-11-11 20:49:04 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2019-11-11 20:49:04 +0100 |
| commit | 4c295646ba0e175743e6be13457308c1e6d21dd3 (patch) | |
| tree | 9ecb5a1e4904fab2ac678c2b4e5890d4c8c0c39e /configure.ac | |
| parent | gpg: Forbid the creation of SHA-1 third-party key signatures. (diff) | |
| download | gnupg2-4c295646ba0e175743e6be13457308c1e6d21dd3.tar.xz gnupg2-4c295646ba0e175743e6be13457308c1e6d21dd3.zip | |
dirmngr: Remove cruft from dirmngr_ldap
* configure.ac (USE_LDAPWRAPPER): Remove ac_define and conditional.
* dirmngr/Makefile.am: Remove USE_LDAPWRAPPER and considere true.
* dirmngr/ldap-wrapper-ce.c: Remove.
* dirmngr/ldap-wrapper.c: Remove USE_LDAPWRAPPER stuff. Minor chnages
to debug output.
* dirmngr/dirmngr_ldap.c: Remove USE_LDAPWRAPPER stuff. Remove
my_ldap macros.
(fetch_ldap) [W32]: Use ldap_sslinit.
--
Note that the ldap_sslinit stuff for Windows has not been tested.
This patch removes the whole wrapper-but-linked business because we do
not need it anymore. WindowsCE for which we used it is pretty dead.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 5bb366e76..3ccd8ab6a 100644 --- a/configure.ac +++ b/configure.ac @@ -664,7 +664,6 @@ have_w32_system=no have_w32ce_system=no have_android_system=no use_simple_gettext=no -use_ldapwrapper=yes mmap_needed=yes require_pipe_to_unblock_pselect=yes case "${host}" in @@ -1225,15 +1224,7 @@ fi AM_CONDITIONAL(USE_LDAP, [test "$gnupg_have_ldap" = yes]) if test "$gnupg_have_ldap" = yes ; then AC_DEFINE(USE_LDAP,1,[Defined if LDAP is support]) -else - use_ldapwrapper=no -fi - -if test "$use_ldapwrapper" = yes; then - AC_DEFINE(USE_LDAPWRAPPER,1, [Build dirmngr with LDAP wrapper process]) fi -AM_CONDITIONAL(USE_LDAPWRAPPER, test "$use_ldapwrapper" = yes) - |