Commit preliminary fix for ldap.conf base usage.

[openldap] / libraries / libldap / sort.c

diff --git a/libraries/libldap/sort.c b/libraries/libldap/sort.c
index 7771b4b7c0ed9ebc51be6399058606c253e8efd9..831947019dabbec8db1b2e76285dd2e1de09b282 100644 (file)
--- a/libraries/libldap/sort.c
+++ b/libraries/libldap/sort.c
@@ -29,17 +29,17 @@ struct entrything {
        LDAPMessage     *et_msg;
 };
 
-static int     (*et_cmp_fn) LDAP_P(( char *a, char *b ));
+static int     (*et_cmp_fn) LDAP_P(( const char *a, const char *b ));
 static int     et_cmp LDAP_P(( const void *aa, const void *bb));
 
 
 int
 ldap_sort_strcasecmp(
-    char       **a,
-    char       **b
+       const void      *a,
+       const void      *b
 )
 {
-       return( strcasecmp( *a, *b ) );
+       return( strcasecmp( *(char *const *)a, *(char *const *)b ) );
 }
 
 static int
@@ -78,7 +78,7 @@ ldap_sort_entries(
     LDAP       *ld,
     LDAPMessage        **chain,
     char       *attr,          /* NULL => sort by DN */
-    int                (*cmp) LDAP_P((const char *, const char *))
+    int                (*cmp) (const char *, const char *)
 )
 {
        int                     i, count;
@@ -131,7 +131,7 @@ int
 ldap_sort_values(
     LDAP       *ld,
     char       **vals,
-    int                (*cmp) LDAP_P((const void *, const void *))
+    int                (*cmp) (const void *, const void *)
 )
 {
        int     nel;