summaryrefslogtreecommitdiffstats
path: root/ldap/servers/plugins/replication/replutil.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 /ldap/servers/plugins/replication/replutil.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 'ldap/servers/plugins/replication/replutil.c')
-rw-r--r--ldap/servers/plugins/replication/replutil.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ldap/servers/plugins/replication/replutil.c b/ldap/servers/plugins/replication/replutil.c
index c1a86255..8703c7c2 100644
--- a/ldap/servers/plugins/replication/replutil.c
+++ b/ldap/servers/plugins/replication/replutil.c
@@ -381,9 +381,9 @@ make_changes_string(LDAPMod **ldm, char **includeattrs)
ldm[ i ]->mod_bvalues[ j ]->bv_len ) + 1;
buf = slapi_ch_malloc( len );
bufp = buf;
- ldif_put_type_and_value( &bufp, ldm[ i ]->mod_type,
+ slapi_ldif_put_type_and_value_with_options( &bufp, ldm[ i ]->mod_type,
ldm[ i ]->mod_bvalues[ j ]->bv_val,
- ldm[ i ]->mod_bvalues[ j ]->bv_len );
+ ldm[ i ]->mod_bvalues[ j ]->bv_len, 0 );
*bufp = '\0';
addlenstr( l, buf );
@@ -739,10 +739,10 @@ repl_set_mtn_state_and_referrals(
/* next, add the repl root dn to each referral if not present */
for (ii = 0; referrals_to_set && referrals_to_set[ii]; ++ii) {
- struct ldap_url_desc *lud = NULL;
- int myrc = ldap_url_parse(referrals_to_set[ii], &lud);
+ LDAPURLDesc *lud = NULL;
+ int myrc = slapi_ldap_url_parse(referrals_to_set[ii], &lud, 0, NULL);
/* see if the dn is already in the referral URL */
- if (myrc == LDAP_URL_ERR_NODN || !lud || !lud->lud_dn) {
+ if (!lud || !lud->lud_dn) {
/* add the dn */
int len = strlen(referrals_to_set[ii]);
const char *cdn = slapi_sdn_get_dn(repl_root_sdn);