]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s4:rpc_srv:getncchanges: 4.5 anc emulation uses qsort(), not ldb_qsort()
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Fri, 12 Apr 2024 06:32:42 +0000 (18:32 +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 e33c21200cd0be3c107cbcd7aa44a34c02b567ac..2e95811b447496f141d1a592b43b46161de08210 100644 (file)
@@ -1026,8 +1026,7 @@ struct drsuapi_changed_objects {
   sort the objects we send by tree order (Samba 4.5 emulation)
  */
 static int site_res_cmp_anc_order(struct drsuapi_changed_objects *m1,
-                                 struct drsuapi_changed_objects *m2,
-                                 struct drsuapi_getncchanges_state *getnc_state)
+                                 struct drsuapi_changed_objects *m2)
 {
        return ldb_dn_compare(m2->dn, m1->dn);
 }
@@ -3322,10 +3321,9 @@ allowed:
                if (req10->extended_op == DRSUAPI_EXOP_FSMO_RID_ALLOC) {
                        /* Do nothing */
                } else if (getnc_state->broken_samba_4_5_get_anc_emulation) {
-                       LDB_TYPESAFE_QSORT(changes,
-                                          getnc_state->num_records,
-                                          getnc_state,
-                                          site_res_cmp_anc_order);
+                       TYPESAFE_QSORT(changes,
+                                      getnc_state->num_records,
+                                      site_res_cmp_anc_order);
                } else {
                        LDB_TYPESAFE_QSORT(changes,
                                           getnc_state->num_records,