diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2009-07-06 12:11:01 -0600 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2009-07-07 08:32:42 -0600 |
| commit | 209521323f731daad54682fd98715f7b22c88c78 (patch) | |
| tree | 74a1fa8df06641fe543c8518e4db4357ab610828 /ldap/servers/slapd/slap.h | |
| parent | 3116dbec570b65d2d0a1df5bd000f6e63439e8ee (diff) | |
| download | ds-209521323f731daad54682fd98715f7b22c88c78.tar.gz ds-209521323f731daad54682fd98715f7b22c88c78.tar.xz ds-209521323f731daad54682fd98715f7b22c88c78.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 'ldap/servers/slapd/slap.h')
| -rw-r--r-- | ldap/servers/slapd/slap.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h index fd2c7d73..7fd67613 100644 --- a/ldap/servers/slapd/slap.h +++ b/ldap/servers/slapd/slap.h @@ -188,9 +188,6 @@ typedef struct symbol_t { * XXXmcs: these are defined by ldap.h or ldap-extension.h, * but only in a newer release than we use with DS today. */ -#ifndef LDAP_CONTROL_AUTH_REQUEST -#define LDAP_CONTROL_AUTH_REQUEST "2.16.840.1.113730.3.4.16" -#endif #ifndef LDAP_CONTROL_AUTH_RESPONSE #define LDAP_CONTROL_AUTH_RESPONSE "2.16.840.1.113730.3.4.15" #endif @@ -2047,8 +2044,12 @@ extern char *attr_dataversion; #define SLAPD_SNMP_UPDATE_INTERVAL (10 * 1000) /* 10 seconds */ +#ifndef LDAP_AUTH_KRBV41 #define LDAP_AUTH_KRBV41 0x81L +#endif +#ifndef LDAP_AUTH_KRBV42 #define LDAP_AUTH_KRBV42 0x82L +#endif /* for timing certain operations */ #ifdef USE_TIMERS |