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. --- include/ldaputil/ldapauth.h | 58 --------------------------------------------- 1 file changed, 58 deletions(-) (limited to 'include/ldaputil/ldapauth.h') diff --git a/include/ldaputil/ldapauth.h b/include/ldaputil/ldapauth.h index c2c7f99b..fc1ab934 100644 --- a/include/ldaputil/ldapauth.h +++ b/include/ldaputil/ldapauth.h @@ -54,9 +54,6 @@ #endif #endif -typedef int (*LDAPU_GroupCmpFn_t)(const void *groupids, const char *group, - const int len); - #ifdef __cplusplus extern "C" { #endif @@ -69,61 +66,6 @@ int ldapu_find_entire_tree (LDAP *ld, int scope, const char *filter, const char **attrs, int attrsonly, LDAPMessage ***res); -extern int ldapu_auth_userdn_groupdn (LDAP *ld, const char *userdn, - const char *groupdn, - const char *base); - -extern int ldapu_auth_uid_groupdn (LDAP *ld, const char *uid, - const char *groupdn, const char *base); - -extern int ldapu_auth_uid_groupid (LDAP *ld, const char *uid, - const char *groupid, const char *base); - -extern int ldapu_auth_userdn_groupid (LDAP *ld, - const char *userdn, const char *groupid, - const char *base); - -extern int ldapu_auth_userdn_groupids (LDAP *ld, const char *userdn, - void *groupids, - LDAPU_GroupCmpFn_t grpcmpfn, - const char *base, - char **group_out); - -extern int ldapu_auth_userdn_attrfilter (LDAP *ld, - const char *userdn, - const char *attrfilter); - -extern int ldapu_auth_uid_attrfilter (LDAP *ld, const char *uid, - const char *attrfilter, - const char *base); - -extern int ldapu_auth_userdn_password (LDAP *ld, - const char *userdn, - const char *password); - -extern int ldapu_find_uid_attrs (LDAP *ld, const char *uid, - const char *base, const char **attrs, - int attrsonly, LDAPMessage **res); - -extern int ldapu_find_uid (LDAP *ld, const char *uid, - const char *base, LDAPMessage **res); - -NSAPI_PUBLIC extern int ldapu_find_userdn (LDAP *ld, const char *uid, - const char *base, char **dn); - -extern int ldapu_find_group_attrs (LDAP *ld, const char *groupid, - const char *base, const char **attrs, - int attrsonly, LDAPMessage **res); - -extern int ldapu_find_group (LDAP *ld, const char *groupid, - const char *base, LDAPMessage **res); - -extern int ldapu_find_groupdn (LDAP *ld, const char *groupid, - const char *base, char **dn); - -extern int ldapu_auth_uid_password (LDAP *ld, const char *uid, - const char *password, const char *base); - #ifdef __cplusplus } #endif -- cgit