From 4c295646ba0e175743e6be13457308c1e6d21dd3 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 11 Nov 2019 20:49:04 +0100 Subject: 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 --- dirmngr/ldap-wrapper.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'dirmngr/ldap-wrapper.h') diff --git a/dirmngr/ldap-wrapper.h b/dirmngr/ldap-wrapper.h index a015efafe..640300522 100644 --- a/dirmngr/ldap-wrapper.h +++ b/dirmngr/ldap-wrapper.h @@ -31,10 +31,4 @@ gpg_error_t ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[]); -/* dirmngr_ldap.c */ -#ifndef USE_LDAPWRAPPER -int ldap_wrapper_main (char **argv, estream_t outstream); -#endif - - #endif /*LDAP_WRAPPER_H*/ -- cgit v1.2.3