Move replmd_drsuapi_DsReplicaCursor2_compare to a common place.

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 633279ead11c28f4d1cb59c9985acdc5a3e234ff..39fdfe94a502f1eb39d7209af33e57d2ff13864d 100644 (file)
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -2411,3 +2411,9 @@ again:
        
        return ret;
 }
+
+int drsuapi_DsReplicaCursor2_compare(const struct drsuapi_DsReplicaCursor2 *c1,
+                                                  const struct drsuapi_DsReplicaCursor2 *c2)
+{
+       return GUID_compare(&c1->source_dsa_invocation_id, &c2->source_dsa_invocation_id);
+}

diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 283bdf7806359778b24993a28f42067a179cc6b2..fa8bd64bf281797cf299dde0d6e1eabe6fbc2efa 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -1543,12 +1543,6 @@ static int replmd_replicated_uptodate_modify_callback(struct ldb_request *req,
        return ldb_module_done(ar->req, NULL, NULL, LDB_SUCCESS);
 }
 
-static int replmd_drsuapi_DsReplicaCursor2_compare(const struct drsuapi_DsReplicaCursor2 *c1,
-                                                  const struct drsuapi_DsReplicaCursor2 *c2)
-{
-       return GUID_compare(&c1->source_dsa_invocation_id, &c2->source_dsa_invocation_id);
-}
-
 static int replmd_replicated_uptodate_modify(struct replmd_replicated_request *ar)
 {
        struct ldb_context *ldb;
@@ -1703,7 +1697,7 @@ static int replmd_replicated_uptodate_modify(struct replmd_replicated_request *a
         */
        qsort(nuv.ctr.ctr2.cursors, nuv.ctr.ctr2.count,
              sizeof(struct drsuapi_DsReplicaCursor2),
-             (comparison_fn_t)replmd_drsuapi_DsReplicaCursor2_compare);
+             (comparison_fn_t)drsuapi_DsReplicaCursor2_compare);
 
        /*
         * create the change ldb_message

diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c
index f84ffda0944d7e050c7676021cb178e549e3a83a..8538ea8ff14d4da9f7938fd4311dd6902ae4726d 100644 (file)
--- a/source4/rpc_server/drsuapi/getncchanges.c
+++ b/source4/rpc_server/drsuapi/getncchanges.c
@@ -162,12 +162,6 @@ static WERROR get_nc_changes_build_object(struct drsuapi_DsReplicaObjectListItem
        return WERR_OK;
 }
 
-static int replmd_drsuapi_DsReplicaCursor2_compare(const struct drsuapi_DsReplicaCursor2 *c1,
-                                                  const struct drsuapi_DsReplicaCursor2 *c2)
-{
-       return GUID_compare(&c1->source_dsa_invocation_id, &c2->source_dsa_invocation_id);
-}
-
 /*
   load replUpToDateVector from a DN
  */
@@ -252,7 +246,7 @@ static WERROR get_nc_changes_udv(struct ldb_context *sam_ctx,
        
        qsort(udv->cursors, udv->count,
              sizeof(struct drsuapi_DsReplicaCursor2),
-             (comparison_fn_t)replmd_drsuapi_DsReplicaCursor2_compare);
+             (comparison_fn_t)drsuapi_DsReplicaCursor2_compare);
 
        return WERR_OK;
 }