summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-07-15 16:43:26 +0200
committerMichael Adam <obnox@samba.org>2008-07-15 16:43:26 +0200
commitfc6216b2da1087065c26e874058de74ced692fcc (patch)
treebc5dc3335db992020382914c8977da997aa4b428 /source3
parent3899851af02bb5b858ee025504b4c7f12385c0c7 (diff)
downloadsamba-fc6216b2da1087065c26e874058de74ced692fcc.tar.gz
samba-fc6216b2da1087065c26e874058de74ced692fcc.tar.bz2
samba-fc6216b2da1087065c26e874058de74ced692fcc.zip
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)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/dbwrap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/dbwrap.c b/source3/lib/dbwrap.c
index 2bff5d9257..eec15a84bd 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