From 17275561a062b0453f9d2547ecebd6dff08aaa24 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 9 Aug 2012 12:23:13 +1000 Subject: [PATCH] s4-dsdb: Remove ldb_sequence_type argument from partition_primary_sequence_number We always want LDB_SEQ_HIGHEST_SEQ here. Andrew Bartlett --- source4/dsdb/samdb/ldb_modules/partition.c | 6 +++--- source4/dsdb/samdb/ldb_modules/partition_init.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c index 8546d2f290c..5f8c293ca0e 100644 --- a/source4/dsdb/samdb/ldb_modules/partition.c +++ b/source4/dsdb/samdb/ldb_modules/partition.c @@ -985,7 +985,7 @@ static int partition_del_trans(struct ldb_module *module) } int partition_primary_sequence_number(struct ldb_module *module, TALLOC_CTX *mem_ctx, - enum ldb_sequence_type type, uint64_t *seq_number, + uint64_t *seq_number, struct ldb_request *parent) { int ret; @@ -997,7 +997,7 @@ int partition_primary_sequence_number(struct ldb_module *module, TALLOC_CTX *mem if (tseq == NULL) { return ldb_oom(ldb_module_get_ctx(module)); } - tseq->type = type; + tseq->type = LDB_SEQ_HIGHEST_SEQ; ret = dsdb_module_extended(module, tseq, &res, LDB_EXTENDED_SEQUENCE_NUMBER, @@ -1035,7 +1035,7 @@ int partition_sequence_number_from_partitions(struct ldb_module *module, struct partition_private_data *data = talloc_get_type(ldb_module_get_private(module), struct partition_private_data); - ret = partition_primary_sequence_number(module, module, LDB_SEQ_HIGHEST_SEQ, &seq_number, NULL); + ret = partition_primary_sequence_number(module, module, &seq_number, NULL); if (ret != LDB_SUCCESS) { return ret; } diff --git a/source4/dsdb/samdb/ldb_modules/partition_init.c b/source4/dsdb/samdb/ldb_modules/partition_init.c index a0770ccd6f9..98896a7a840 100644 --- a/source4/dsdb/samdb/ldb_modules/partition_init.c +++ b/source4/dsdb/samdb/ldb_modules/partition_init.c @@ -397,7 +397,7 @@ int partition_reload_if_required(struct ldb_module *module, return ldb_oom(ldb); } - ret = partition_primary_sequence_number(module, mem_ctx, LDB_SEQ_HIGHEST_SEQ, &seq, parent); + ret = partition_primary_sequence_number(module, mem_ctx, &seq, parent); if (ret != LDB_SUCCESS) { talloc_free(mem_ctx); return ret; -- 2.11.4.GIT