s4-dsdb: ensure that new partitions inherit any transaction

1 files changed, 15 insertions, 0 deletions

diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c
index 779b8b5a35..64015ed7b1 100644
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -690,6 +690,9 @@ static int partition_start_trans(struct ldb_module *module)
 			return ret;
 		}
 	}
+
+	data->in_transaction++;
+
 	return LDB_SUCCESS;
 }
 
@@ -737,6 +740,12 @@ static int partition_end_trans(struct ldb_module *module)
 		}
 	}
 
+	if (data->in_transaction == 0) {
+		DEBUG(0,("partition end transaction mismatch\n"));
+		return LDB_ERR_OPERATIONS_ERROR;
+	}
+	data->in_transaction--;
+
 	return ldb_next_end_trans(module);
 }
 
@@ -756,6 +765,12 @@ static int partition_del_trans(struct ldb_module *module)
 		}
 	}	
 
+	if (data->in_transaction == 0) {
+		DEBUG(0,("partition del transaction mismatch\n"));
+		return LDB_ERR_OPERATIONS_ERROR;
+	}
+	data->in_transaction--;
+
 	ret = ldb_next_del_trans(module);
 	if (ret != LDB_SUCCESS) {
 		final_ret = ret;