diff options
| author | Anatoliy Atanasov <anatoliy.atanasov@postpath.com> | 2009-09-14 11:46:59 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-19 15:42:00 -0700 |
| commit | 0b68967096b77909c2b83e178f7b20396e1e4c1e (patch) | |
| tree | a77b94046838da6e8f8b1a84f7c8c5615703bf71 | |
| parent | 6e56261eb7d417b488da2d3b051fb8284abb3fbd (diff) | |
| download | samba-0b68967096b77909c2b83e178f7b20396e1e4c1e.tar.gz samba-0b68967096b77909c2b83e178f7b20396e1e4c1e.tar.bz2 samba-0b68967096b77909c2b83e178f7b20396e1e4c1e.zip | |
Move replmd_drsuapi_DsReplicaCursor2_compare to a common place.
| -rw-r--r-- | source4/dsdb/common/util.c | 6 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 8 | ||||
| -rw-r--r-- | source4/rpc_server/drsuapi/getncchanges.c | 8 |
3 files changed, 8 insertions, 14 deletions
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index 633279ead1..39fdfe94a5 100644 --- 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 283bdf7806..fa8bd64bf2 100644 --- 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 f84ffda094..8538ea8ff1 100644 --- 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; } |