[PATCH 1/7] source4/scripting/python/samba/samba3: handle ntdb files.

Volker Lendecke Volker.Lendecke at SerNet.DE
Wed Mar 27 03:25:51 MDT 2013


On Wed, Mar 27, 2013 at 08:08:15PM +1100, Andrew Bartlett wrote:
> On Wed, 2013-03-27 at 08:44 +0100, Volker Lendecke wrote:
> > On Wed, Mar 27, 2013 at 12:56:53PM +1100, Andrew Bartlett wrote:
> > > On Wed, 2013-03-27 at 12:07 +1030, Rusty Russell wrote:
> > > > Upgrading old Samba 3 instances seems like a place where we don't have
> > > > to read ntdb files, but Andrew Bartlett points out that you can run a
> > > > Samba 4.0 and even a 4.1 'classic' domain and desire to migrate that
> > > > to the AD DC.
> > > 
> > > This series looks quite reasonable.  I've pushed them to autobuild.
> > 
> > Please revert at least the patch that enables transactions
> > on clear_if_first databases again until you added this
> > facility to the ctdb case as well.
> 
> The autobuild has been terminated, the patches are not in master.
> 
> Metze caught up with me before the autobuild finished, and I understand
> he has a better approach for schannel pending some final touches.  

Ok. Can someone please review and push the attached patch
that is supposed to avoid this kind of hickup in the future?

Thanks,

Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From 688b49d15cf71a84406add93fa263d06a908d94b Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Wed, 27 Mar 2013 10:23:50 +0100
Subject: [PATCH] dbwrap: Add a comment explaining a restriction

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 lib/dbwrap/dbwrap.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/dbwrap/dbwrap.c b/lib/dbwrap/dbwrap.c
index f0b7a9a..f03514d 100644
--- a/lib/dbwrap/dbwrap.c
+++ b/lib/dbwrap/dbwrap.c
@@ -453,6 +453,17 @@ int dbwrap_get_seqnum(struct db_context *db)
 int dbwrap_transaction_start(struct db_context *db)
 {
 	if (!db->persistent) {
+		/*
+		 * dbwrap_ctdb has two different data models for persistent
+		 * and non-persistent databases. Transactions are supported
+		 * only for the persistent databases. This check is here to
+		 * prevent breakages of the cluster case, autobuild at this
+		 * point only tests non-clustered Samba. Before removing this
+		 * check, please make sure that this facility has also been
+		 * added to dbwrap_ctdb.
+		 *
+		 * Thanks, vl
+		 */
 		DEBUG(1, ("transactions not supported on non-persistent "
 			  "database %s\n", db->name));
 		return -1;
-- 
1.7.9.5



More information about the samba-technical mailing list