[SCM] CTDB repository - branch master updated - ctdb-1.11-92-g996aa01

[Ronnie Sahlberg]

The branch, master has been updated
       via  996aa01af9b402d2cd07c6942fdcc5ffc111ca85 (commit)
       via  c930a44731d24b3bb51851864c7cdd0061483c0b (commit)
      from  0474a9244c6721f85955efcbdd630c0e5990e76c (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 996aa01af9b402d2cd07c6942fdcc5ffc111ca85
Merge: 0474a9244c6721f85955efcbdd630c0e5990e76c c930a44731d24b3bb51851864c7cdd0061483c0b
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Fri Oct 28 13:51:46 2011 +1100

    Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master

commit c930a44731d24b3bb51851864c7cdd0061483c0b
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Fri Oct 28 13:38:32 2011 +1100

    libctdb: dont allow ctdb_writerecord() for readonly records

-----------------------------------------------------------------------

Summary of changes:
 libctdb/ctdb.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libctdb/ctdb.c b/libctdb/ctdb.c
index 099ceac..2f694a1 100644
--- a/libctdb/ctdb.c
+++ b/libctdb/ctdb.c
@@ -950,6 +950,13 @@ ctdb_readonlyrecordlock_async(struct ctdb_db *ctdb_db, TDB_DATA key,
 bool ctdb_writerecord(struct ctdb_db *ctdb_db,
 		      struct ctdb_lock *lock, TDB_DATA data)
 {
+	if (lock->readonly) {
+		errno = EBADF;
+		DEBUG(ctdb_db->ctdb, LOG_ALERT,
+		      "ctdb_writerecord: Can not write, read-only record.");
+		return false;
+	}
+
 	if (lock->ctdb_db != ctdb_db) {
 		errno = EBADF;
 		DEBUG(ctdb_db->ctdb, LOG_ALERT,


-- 
CTDB repository