summaryrefslogtreecommitdiffstats
path: root/lib/ldaputil/cert.c
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2009-07-06 12:11:01 -0600
committerRich Megginson <rmeggins@redhat.com>2009-07-07 08:32:42 -0600
commit209521323f731daad54682fd98715f7b22c88c78 (patch)
tree74a1fa8df06641fe543c8518e4db4357ab610828 /lib/ldaputil/cert.c
parent3116dbec570b65d2d0a1df5bd000f6e63439e8ee (diff)
downloadds-cleanup.tar.gz
ds-cleanup.tar.xz
ds-cleanup.zip
OpenLDAP supportcleanup
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.
Diffstat (limited to 'lib/ldaputil/cert.c')
-rw-r--r--lib/ldaputil/cert.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/ldaputil/cert.c b/lib/ldaputil/cert.c
index ceb57118..30fd0f4b 100644
--- a/lib/ldaputil/cert.c
+++ b/lib/ldaputil/cert.c
@@ -55,6 +55,8 @@
#include <ldaputil/cert.h>
#include "ldaputili.h"
+#include "slapi-plugin.h"
+
NSAPI_PUBLIC int ldapu_get_cert (void *SSLendpoint, void **cert)
{
/* TEMPORARY -- not implemented yet*/
@@ -209,7 +211,7 @@ _rdns_free (char*** rdns)
{
auto char*** rdn;
for (rdn = rdns; *rdn; ++rdn) {
- ldap_value_free (*rdn);
+ slapi_ldap_value_free (*rdn);
}
free (rdns);
}
@@ -230,12 +232,12 @@ _explode_dn (const char* dn)
if (exp) {
exp[expLen++] = avas;
} else {
- ldap_value_free (avas);
+ slapi_ldap_value_free (avas);
break;
}
} else { /* parse error */
if (avas) {
- ldap_value_free (avas);
+ slapi_ldap_value_free (avas);
}
if (exp) {
exp[expLen] = NULL;
@@ -248,7 +250,7 @@ _explode_dn (const char* dn)
if (exp) {
exp[expLen] = NULL;
}
- ldap_value_free (rdns);
+ slapi_ldap_value_free (rdns);
}
}
return exp;