summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/tdb2/tdb1_transaction.c28
-rw-r--r--lib/tdb2/test/run-tdb1-nested-transactions.c5
2 files changed, 25 insertions, 8 deletions
diff --git a/lib/tdb2/tdb1_transaction.c b/lib/tdb2/tdb1_transaction.c
index 126f768468..6e39de33f4 100644
--- a/lib/tdb2/tdb1_transaction.c
+++ b/lib/tdb2/tdb1_transaction.c
@@ -418,18 +418,34 @@ static const struct tdb1_methods transaction1_methods = {
static int _tdb1_transaction_start(struct tdb_context *tdb)
{
/* some sanity checks */
- if ((tdb->flags & TDB_RDONLY) || (tdb->flags & TDB_INTERNAL) || tdb->tdb1.traverse_read) {
- tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
- "tdb1_transaction_start: cannot start a"
- " transaction on a read-only or"
- " internal db");
+ if (tdb->flags & TDB_INTERNAL) {
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL,
+ TDB_LOG_USE_ERROR,
+ "tdb1_transaction_start:"
+ " cannot start a"
+ " transaction on an"
+ " internal tdb");
+ return -1;
+ }
+
+ if ((tdb->flags & TDB_RDONLY) || tdb->tdb1.traverse_read) {
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_RDONLY,
+ TDB_LOG_USE_ERROR,
+ "tdb_transaction_start:"
+ " cannot start a"
+ " transaction on a "
+ " read-only tdb");
return -1;
}
/* cope with nested tdb1_transaction_start() calls */
if (tdb->tdb1.transaction != NULL) {
if (!(tdb->flags & TDB_ALLOW_NESTING)) {
- tdb->last_error = TDB_ERR_EINVAL;
+ tdb->last_error
+ = tdb_logerr(tdb, TDB_ERR_EINVAL,
+ TDB_LOG_USE_ERROR,
+ "tdb_transaction_start:"
+ " already inside transaction");
return -1;
}
tdb->stats.transaction_nest++;
diff --git a/lib/tdb2/test/run-tdb1-nested-transactions.c b/lib/tdb2/test/run-tdb1-nested-transactions.c
index a6a815363c..149e5318a0 100644
--- a/lib/tdb2/test/run-tdb1-nested-transactions.c
+++ b/lib/tdb2/test/run-tdb1-nested-transactions.c
@@ -15,7 +15,7 @@ int main(int argc, char *argv[])
hsize.base.next = &tap_log_attr;
hsize.tdb1_hashsize.hsize = 1024;
- plan_tests(29);
+ plan_tests(30);
key.dsize = strlen("hi");
key.dptr = (void *)"hi";
@@ -33,6 +33,7 @@ int main(int argc, char *argv[])
ok1(memcmp(data.dptr, "world", strlen("world")) == 0);
free(data.dptr);
ok1(tdb_transaction_start(tdb) == TDB_ERR_EINVAL);
+ ok1(tap_log_messages == 1);
ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
ok1(data.dsize == strlen("world"));
@@ -55,7 +56,7 @@ int main(int argc, char *argv[])
ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS);
ok1(!tdb_exists(tdb, key));
tdb_transaction_cancel(tdb);
- ok1(tap_log_messages == 0);
+ ok1(tap_log_messages == 1);
/* Surprise! Kills inner "committed" transaction. */
ok1(tdb_exists(tdb, key));