[SCM] Samba Shared Repository - branch master updated

[Rusty Russell]

The branch, master has been updated
       via  92c022f tdb2: allow readonly changes even while holding locks.
      from  da5224a s3:dbwrap_ctdb: skip the internal __db_sequence_number__ key from (persistent) traverse and traverse_read

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


- Log -----------------------------------------------------------------
commit 92c022f04392e731ee1e5389ed021b54317da141
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Tue Sep 20 12:02:43 2011 +0930

    tdb2: allow readonly changes even while holding locks.
    
    This happens in SAMBA with the TDB_VERSION1, presumably due to a
    read-only traverse nested inside a normal traverse (since it doesn't
    occur without TDB_VERSION1).
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    (Imported from CCAN commit 24e5ddb143fb5e79112649472258f5da67cc7362)
    
    Autobuild-User: Rusty Russell <rusty at rustcorp.com.au>
    Autobuild-Date: Tue Sep 20 09:35:10 CEST 2011 on sn-devel-104

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

Summary of changes:
 lib/tdb2/tdb.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdb2/tdb.c b/lib/tdb2/tdb.c
index 9447816..6f38244 100644
--- a/lib/tdb2/tdb.c
+++ b/lib/tdb2/tdb.c
@@ -369,16 +369,6 @@ static bool readonly_changable(struct tdb_context *tdb, const char *caller)
 					     caller);
 		return false;
 	}
-
-	if (tdb->file->allrecord_lock.count != 0
-	    || tdb->file->num_lockrecs != 0) {
-		tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL,
-					     TDB_LOG_USE_ERROR,
-					     "%s: can't change"
-					     " TDB_RDONLY holding locks",
-					     caller);
-		return false;
-	}
 	return true;
 }
 


-- 
Samba Shared Repository