]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s4-dsdb: Remove ldb_sequence_type argument from partition_primary_sequence_number
authorAndrew Bartlett <abartlet@samba.org>
Thu, 9 Aug 2012 02:23:13 +0000 (12:23 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 9 Aug 2012 02:32:18 +0000 (04:32 +0200)
We always want LDB_SEQ_HIGHEST_SEQ here.

Andrew Bartlett

source4/dsdb/samdb/ldb_modules/partition.c
source4/dsdb/samdb/ldb_modules/partition_init.c

index 8546d2f290cfff3aee9ce7e6ade64944634f7c77..5f8c293ca0e075dcda3ffca56bc3de7a77fd9dc6 100644 (file)
@@ -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;
        }
index a0770ccd6f902c2c8acdfe3c003989d9c21c50d9..98896a7a84080ac21820bdb71ae0991395223371 100644 (file)
@@ -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;