[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.6_ctdb.52-4-g392ef47

[Michael Adam]

The branch, v3-2-ctdb has been updated
       via  392ef47470e7b246157aa13b9550af96a600d169 (commit)
       via  7337f1e2479763c93989bcc568de381bad793ffb (commit)
       via  8fa83ebb727f5f1a94e9e2de73123633fa05d6ab (commit)
      from  c6c6e18ffc038f8c43d1ea7a2bbefab55f94d44e (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb


- Log -----------------------------------------------------------------
commit 392ef47470e7b246157aa13b9550af96a600d169
Author: Michael Adam <obnox at samba.org>
Date:   Thu Dec 25 23:32:16 2008 +0100

    idmap_tdb2: fix two nonempty blank lines.
    
    This removes the remaining diff between idmap_tdb2 in
    v3-2-ctdb an master/v3-3-test.
    
    Michael

commit 7337f1e2479763c93989bcc568de381bad793ffb
Author: Michael Adam <obnox at samba.org>
Date:   Thu Dec 25 23:21:36 2008 +0100

    idmap_tdb2: use transactions in tdb store operations.
    
    These two dbwrap_trans_store_int32 calls got lost in commit
    cf9baeed210cb5ebddbb1c56a2c49d16eb24c49f
    (remove "idmap alloc config : range" parameter).
    
    The problem seems to have been that the idmap rewrite
    was originally done in v3-3-test before the switch of idmap_tdb2
    to transactions while in v3-2-ctdb, the order was reversed.
    
    Michael

commit 8fa83ebb727f5f1a94e9e2de73123633fa05d6ab
Author: Michael Adam <obnox at samba.org>
Date:   Thu Dec 25 21:55:49 2008 +0100

    dbwrap_ctdb: Remove some trailing tabs.
    
    This is to synchronise dbwrap_ctdb.c more with upstream branches
    v3-3-test and master.
    
    Michael

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

Summary of changes:
 source/lib/dbwrap_ctdb.c     |    4 ++--
 source/winbindd/idmap_tdb2.c |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/dbwrap_ctdb.c b/source/lib/dbwrap_ctdb.c
index 69223aa..2818634 100644
--- a/source/lib/dbwrap_ctdb.c
+++ b/source/lib/dbwrap_ctdb.c
@@ -441,9 +441,9 @@ static struct db_record *db_ctdb_fetch_locked_persistent(struct db_ctdb_ctx *ctx
 	/* destroy this transaction when we release the lock */
 	recp = talloc(rec, struct db_record *);
 	if (recp == NULL) {
-		ctx->db->transaction_cancel(ctx->db);		
+		ctx->db->transaction_cancel(ctx->db);
 		talloc_free(rec);
-		return NULL;		
+		return NULL;
 	}
 	*recp = rec;
 	talloc_set_destructor(recp, db_ctdb_record_destructor);
diff --git a/source/winbindd/idmap_tdb2.c b/source/winbindd/idmap_tdb2.c
index 17a2674..8bde963 100644
--- a/source/winbindd/idmap_tdb2.c
+++ b/source/winbindd/idmap_tdb2.c
@@ -132,9 +132,9 @@ static NTSTATUS idmap_tdb2_alloc_load(void)
 	if (((low_id = dbwrap_fetch_int32(idmap_tdb2,
 					  HWM_USER)) == -1) ||
 	    (low_id < idmap_tdb2_state.low_uid)) {
-		if (dbwrap_store_int32(
-			    idmap_tdb2, HWM_USER,
-			    idmap_tdb2_state.low_uid) == -1) {
+		if (!NT_STATUS_IS_OK(dbwrap_trans_store_int32(
+					     idmap_tdb2, HWM_USER,
+					     idmap_tdb2_state.low_uid))) {
 			DEBUG(0, ("Unable to initialise user hwm in idmap "
 				  "database\n"));
 			return NT_STATUS_INTERNAL_DB_ERROR;
@@ -150,9 +150,9 @@ static NTSTATUS idmap_tdb2_alloc_load(void)
 	if (((low_id = dbwrap_fetch_int32(idmap_tdb2,
 					  HWM_GROUP)) == -1) ||
 	    (low_id < idmap_tdb2_state.low_gid)) {
-		if (dbwrap_store_int32(
-			    idmap_tdb2, HWM_GROUP,
-			    idmap_tdb2_state.low_gid) == -1) {
+		if (!NT_STATUS_IS_OK(dbwrap_trans_store_int32(
+					     idmap_tdb2, HWM_GROUP,
+					     idmap_tdb2_state.low_gid))) {
 			DEBUG(0, ("Unable to initialise group hwm in idmap "
 				  "database\n"));
 			return NT_STATUS_INTERNAL_DB_ERROR;
@@ -187,7 +187,7 @@ static NTSTATUS idmap_tdb2_allocate_id(struct unixid *xid)
 	uint32_t hwm;
 	int res;
 	NTSTATUS status;
-	
+
 	status = idmap_tdb2_open_db();
 	NT_STATUS_NOT_OK_RETURN(status);
 
@@ -268,7 +268,7 @@ static NTSTATUS idmap_tdb2_get_hwm(struct unixid *xid)
 	uint32_t hwm;
 	uint32_t high_hwm;
 	NTSTATUS status;
-	
+
 	status = idmap_tdb2_open_db();
 	NT_STATUS_NOT_OK_RETURN(status);
 


-- 
SAMBA-CTDB repository