s4:rpc_srv:getncchanges: USN sort uses qsort() instead of ldb_qsort()
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Fri, 12 Apr 2024 06:33:47 +0000 (18:33 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 7 May 2024 23:25:35 +0000 (23:25 +0000)
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source4/rpc_server/drsuapi/getncchanges.c

index 2e95811b447496f141d1a592b43b46161de08210..0ae6aa510cff05292b03551b3930126300873666 100644 (file)
@@ -1035,8 +1035,7 @@ static int site_res_cmp_anc_order(struct drsuapi_changed_objects *m1,
   sort the objects we send first by uSNChanged
  */
 static int site_res_cmp_usn_order(struct drsuapi_changed_objects *m1,
-                                 struct drsuapi_changed_objects *m2,
-                                 struct drsuapi_getncchanges_state *getnc_state)
+                                 struct drsuapi_changed_objects *m2)
 {
        if (m1->usn == m2->usn) {
                return ldb_dn_compare(m2->dn, m1->dn);
@@ -3325,10 +3324,9 @@ allowed:
                                       getnc_state->num_records,
                                       site_res_cmp_anc_order);
                } else {
-                       LDB_TYPESAFE_QSORT(changes,
-                                          getnc_state->num_records,
-                                          getnc_state,
-                                          site_res_cmp_usn_order);
+                       TYPESAFE_QSORT(changes,
+                                      getnc_state->num_records,
+                                      site_res_cmp_usn_order);
                }
 
                for (i=0; i < getnc_state->num_records; i++) {