From: Michael Adam <obnox@samba.org>
Date: Tue, 15 Jul 2008 14:43:26 +0000 (+0200)
Subject: dbwrap: don't panic in db_open_trans() if called with TDB_CLEAR_IF_FIRST.
X-Git-Tag: samba-4.0.0alpha6~801^2~687^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc6216b2da1087065c26e874058de74ced692fcc;p=thirdparty%2Fsamba.git

dbwrap: don't panic in db_open_trans() if called with TDB_CLEAR_IF_FIRST.

return NULL instead and leave appropriated measures to the caller.

Michael
(This used to be commit 1002507b56a13420d8178c5397610edd839a7584)
---

diff --git a/source3/lib/dbwrap.c b/source3/lib/dbwrap.c
index 2bff5d9257b..eec15a84bd6 100644
--- a/source3/lib/dbwrap.c
+++ b/source3/lib/dbwrap.c
@@ -118,7 +118,7 @@ struct db_context *db_open_trans(TALLOC_CTX *mem_ctx,
 	if (tdb_flags & TDB_CLEAR_IF_FIRST) {
 		DEBUG(0,("db_open_trans: called with TDB_CLEAR_IF_FIRST: %s\n",
 			 name));
-		smb_panic("db_open_trans: called with TDB_CLEAR_IF_FIRST");
+		return NULL;
 	}
 
 #ifdef CLUSTER_SUPPORT