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/back-ldbm/ldbm_modrdn.c | |
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/back-ldbm/ldbm_modrdn.c')
-rw-r--r-- | ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c index c71dd8ee..ce4c8797 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c @@ -660,7 +660,7 @@ ldbm_back_modrdn( Slapi_PBlock *pb ) if (LDBM_OS_ERR_IS_DISKFULL(retval)) disk_full = 1; } } - ldap_value_free( rdns ); + slapi_ldap_value_free( rdns ); if (DB_LOCK_DEADLOCK == retval) { /* Retry txn */ @@ -1055,8 +1055,8 @@ moddn_newrdn_mods(Slapi_PBlock *pb, const char *olddn, struct backentry *ec, Sla */ if (!op_shared_is_allowed_attr (type, is_repl_op)) { - ldap_value_free( rdns ); - ldap_value_free( dns ); + slapi_ldap_value_free( rdns ); + slapi_ldap_value_free( dns ); slapi_ch_free_string(&dn); return LDAP_UNWILLING_TO_PERFORM; } @@ -1064,13 +1064,13 @@ moddn_newrdn_mods(Slapi_PBlock *pb, const char *olddn, struct backentry *ec, Sla slapi_mods_add_modbvps( smods_wsi, LDAP_MOD_DELETE, type, bvps ); } } - ldap_value_free( rdns ); + slapi_ldap_value_free( rdns ); } else { badrdn = 1; } - ldap_value_free( dns ); + slapi_ldap_value_free( dns ); } else { @@ -1106,7 +1106,7 @@ moddn_newrdn_mods(Slapi_PBlock *pb, const char *olddn, struct backentry *ec, Sla slapi_mods_add_modbvps( smods_wsi, LDAP_MOD_ADD, type, bvps ); } } - ldap_value_free( rdns ); + slapi_ldap_value_free( rdns ); } else { @@ -1313,7 +1313,7 @@ moddn_rename_child_entry( strcat(newdn,", "); } } - ldap_value_free( olddns ); + slapi_ldap_value_free( olddns ); slapi_entry_set_dn( ec->ep_entry, newdn ); add_update_entrydn_operational_attributes (ec); @@ -1369,7 +1369,7 @@ moddn_rename_children( char **parentdns; parentdns = ldap_explode_dn( slapi_sdn_get_dn(dn_parentdn), 0 ); for(;parentdns[parentdncomps]!=NULL;parentdncomps++); - ldap_value_free( parentdns ); + slapi_ldap_value_free( parentdns ); } /* @@ -1392,7 +1392,7 @@ moddn_rename_children( i++; } } - ldap_value_free( newsuperiordns ); + slapi_ldap_value_free( newsuperiordns ); return retval; } |