X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftransaction.c;h=a29acf96e2d417c8c3d79313f8ada959f7c5719c;hb=2b50be90a23893a06e0f1436a31d18b97ad0e11d;hp=eda65c520842240e871ed3439378432f102a4d9c;hpb=77658070a3e4f712b94d659b2e399031ce3394c8;p=ccan

diff --git a/ccan/tdb2/transaction.c b/ccan/tdb2/transaction.c
index eda65c52..a29acf96 100644
--- a/ccan/tdb2/transaction.c
+++ b/ccan/tdb2/transaction.c
@@ -523,13 +523,22 @@ enum TDB_ERROR tdb_transaction_start(struct tdb_context *tdb)
 
 	tdb->stats.transactions++;
 	/* some sanity checks */
-	if (tdb->read_only || (tdb->flags & TDB_INTERNAL)) {
+	if (tdb->flags & TDB_INTERNAL) {
 		return tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL,
+						    TDB_LOG_USE_ERROR,
+						    "tdb_transaction_start:"
+						    " cannot start a"
+						    " transaction on an"
+						    " internal tdb");
+	}
+
+	if (tdb->flags & TDB_RDONLY) {
+		return tdb->last_error = tdb_logerr(tdb, TDB_ERR_RDONLY,
 						    TDB_LOG_USE_ERROR,
 						    "tdb_transaction_start:"
 						    " cannot start a"
 						    " transaction on a "
-						    "read-only or internal db");
+						    " read-only tdb");
 	}
 
 	/* cope with nested tdb_transaction_start() calls */
@@ -1187,7 +1196,7 @@ enum TDB_ERROR tdb_transaction_recover(struct tdb_context *tdb)
 		return TDB_SUCCESS;
 	}
 
-	if (tdb->read_only) {
+	if (tdb->flags & TDB_RDONLY) {
 		return tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
 				  "tdb_transaction_recover:"
 				  " attempt to recover read only database");