From bb75d74d5ea1695e64cc63b1e328cc5ebeb5cdd5 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Fri, 27 Aug 2010 11:55:29 -0600 Subject: implement slapi_ldap_explode_dn and slapi_ldap_explode_rdn The DS has some problems with the openldap versions of these functions: 1) They are deprecated - should use the str2[r]dn and [r]dn2str and the bv versions of those functions instead 2) They escape utf-8 and other values in the strings - the mozldap functions do not do this 3) They handle double quoted strings, but they remove the quotes - our code expects the quotes to be left in place Until we fix our DN handling, and get rid of the double quoted DNs, we just use the mozldap versions of these functions. --- ldap/servers/plugins/acl/aclutil.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ldap/servers/plugins/acl/aclutil.c') diff --git a/ldap/servers/plugins/acl/aclutil.c b/ldap/servers/plugins/acl/aclutil.c index e1eb0ab1..d5729110 100644 --- a/ldap/servers/plugins/acl/aclutil.c +++ b/ldap/servers/plugins/acl/aclutil.c @@ -556,8 +556,8 @@ aclutil_expand_paramString ( char *str, Slapi_Entry *e ) char *buf = NULL; - e_dns = ldap_explode_dn ( slapi_entry_get_ndn ( e ), 0 ); - a_dns = ldap_explode_dn ( str, 0 ); + e_dns = slapi_ldap_explode_dn ( slapi_entry_get_ndn ( e ), 0 ); + a_dns = slapi_ldap_explode_dn ( str, 0 ); i = 0; ncomponents = 0; -- cgit