[SCM] Samba Shared Repository - branch v3-6-test updated

[Volker Lendecke]

The branch, v3-6-test has been updated
       via  9fe6406 s3: Pass tdb_flags to ctdbd when attaching to a db
      from  a78b0d5 pidl:Samba4/NDR/Parser: fix NDR64 union alignment

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


- Log -----------------------------------------------------------------
commit 9fe6406a9a34907d759814b2bdf8ecedb85c7d80
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Oct 25 11:07:36 2010 +0200

    s3: Pass tdb_flags to ctdbd when attaching to a db
    
    This is required to make ctdb create databases with INCOMPATIBLE_HASH

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

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


Changeset truncated at 500 lines:

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index ff28614..7644d7e 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -884,7 +884,7 @@ NTSTATUS ctdbd_db_attach(struct ctdbd_connection *conn,
 			       persistent
 			       ? CTDB_CONTROL_DB_ATTACH_PERSISTENT
 			       : CTDB_CONTROL_DB_ATTACH,
-			       0, 0, data, NULL, &data, &cstatus);
+			       tdb_flags, 0, data, NULL, &data, &cstatus);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0, (__location__ " ctdb_control for db_attach "
 			  "failed: %s\n", nt_errstr(status)));


-- 
Samba Shared Repository