[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre2-744-gd5d3ba3

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  d5d3ba38e238de4523effec1249a871ff6c2a5b6 (commit)
      from  8e1fbbcee67d122b8b35b4da4c167da0db049f85 (commit)

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


- Log -----------------------------------------------------------------
commit d5d3ba38e238de4523effec1249a871ff6c2a5b6
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Apr 14 12:53:11 2008 +0200

    Fix the build of db_open_trans with CLUSTER_SUPPORT enabled
    
    Metze, you might want to check this.
    (cherry picked from commit 3b4a402bc5c3490000581d43a12388883bcf8150)

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

Summary of changes:
 source/lib/dbwrap.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/dbwrap.c b/source/lib/dbwrap.c
index d688b83..7fe1631 100644
--- a/source/lib/dbwrap.c
+++ b/source/lib/dbwrap.c
@@ -131,6 +131,7 @@ struct db_context *db_open_trans(TALLOC_CTX *mem_ctx,
 		}
 		/* allow ctdb for individual databases to be disabled */
 		if (lp_parm_bool(-1, "ctdb", partname, true)) {
+			struct db_context *result = NULL;
 			result = db_open_ctdb(mem_ctx, partname, hash_size,
 					      tdb_flags, open_flags, mode);
 			if (result == NULL) {
@@ -139,6 +140,7 @@ struct db_context *db_open_trans(TALLOC_CTX *mem_ctx,
 				smb_panic("failed to attach to a ctdb "
 					  "database");
 			}
+			return result;
 		}
 	}
 #endif


-- 
Samba Shared Repository