diff options
Diffstat (limited to 'ldap/servers/slapd/back-ldbm/vlv_srch.c')
| -rw-r--r-- | ldap/servers/slapd/back-ldbm/vlv_srch.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/ldap/servers/slapd/back-ldbm/vlv_srch.c b/ldap/servers/slapd/back-ldbm/vlv_srch.c index 63c63485..af68d1c5 100644 --- a/ldap/servers/slapd/back-ldbm/vlv_srch.c +++ b/ldap/servers/slapd/back-ldbm/vlv_srch.c @@ -567,7 +567,7 @@ vlvIndex_delete(struct vlvIndex** ppvs) } } } - ldap_free_sort_keylist((*ppvs)->vlv_sortkey); + internal_ldap_free_sort_keylist((*ppvs)->vlv_sortkey); attrinfo_delete(&((*ppvs)->vlv_attrinfo)); slapi_ch_free((void**)&((*ppvs)->vlv_name)); slapi_ch_free((void**)&((*ppvs)->vlv_filename)); @@ -602,7 +602,7 @@ vlvIndex_init(struct vlvIndex* p, backend *be, struct vlvSearch* pSearch, const p->vlv_search= pSearch; /* Convert the textual sort specification into a keylist structure */ - ldap_create_sort_keylist(&(p->vlv_sortkey),p->vlv_sortspec); + internal_ldap_create_sort_keylist(&(p->vlv_sortkey),p->vlv_sortspec); { /* * For each sort attribute find the appropriate syntax plugin, @@ -938,3 +938,23 @@ vlv_isvlv(char *filename) return 1; return 0; } + +void +internal_ldap_free_sort_keylist(LDAPsortkey **sortKeyList) +{ +#if defined(USE_OPENLDAP) + ldap_free_sort_keylist((LDAPSortKey **)sortKeyList); +#else + ldap_free_sort_keylist(sortKeyList); +#endif +} + +int +internal_ldap_create_sort_keylist(LDAPsortkey ***sortKeyList, const char *string_rep) +{ +#if defined(USE_OPENLDAP) + return ldap_create_sort_keylist((LDAPSortKey ***)sortKeyList, (char *)string_rep); +#else + return ldap_create_sort_keylist(sortKeyList, string_rep); +#endif +} |