From 209521323f731daad54682fd98715f7b22c88c78 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Mon, 6 Jul 2009 12:11:01 -0600 Subject: OpenLDAP support These changes allow the server to be built with OpenLDAP (2.4.17+). A brief summary of the changes: * #defines not provided by OpenLDAP were copied into slapi-plugin.h and protected with #ifndef blocks * where it made sense, I created slapi wrapper functions for things like URL and LDIF processing to abstract way the differences in the APIs * I created a new file utf8.c which contains the UTF8 functions from MozLDAP - this is only compiled when using OpenLDAP * I tried to clean up the code - use the _ext versions of LDAP functions everywhere since the older versions should be considered deprecated * I removed some unused code NOTE that this should still be considered a work in progress since it depends on functionality not yet present in a released version of OpenLDAP, for NSS crypto and for the LDIF public API. --- lib/ldaputil/init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/ldaputil/init.c') diff --git a/lib/ldaputil/init.c b/lib/ldaputil/init.c index 51a09600..ffbde7e1 100644 --- a/lib/ldaputil/init.c +++ b/lib/ldaputil/init.c @@ -54,6 +54,8 @@ #include "ldaputil/errors.h" #include "ldaputil/init.h" +#include "slapi-plugin.h" + #ifdef XP_WIN32 #define DLL_SUFFIX ".dll" #ifndef FILE_PATHSEP @@ -200,7 +202,7 @@ NSAPI_PUBLIC int CertMapDLLInitFn(LDAPUDispatchVector_t **table) NSAPI_PUBLIC int CertMapDLLInitFn(LDAPUDispatchVector_t **table) { - *table = (LDAPUDispatchVector_t *)malloc(sizeof(LDAPUDispatchVector_t)); + *table = (LDAPUDispatchVector_t *)slapi_ch_malloc(sizeof(LDAPUDispatchVector_t)); if (!*table) return LDAPU_ERR_OUT_OF_MEMORY; -- cgit