From 12ea0fd34cec2d7b6d8c8374dfd95728112585b3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 16 Oct 2004 13:47:00 +0000 Subject: r3005: added talloc wrappers around tdb_open() and ldb_connect(), so that the caller doesn't have to worry about the constraint of only opening a database a single time in a process. These wrappers will ensure that only a single open is done, and will auto-close when the last instance is gone. When you are finished with a database pointer, use talloc_free() to close it. note that this code does not take account of the threads process model, and does not yet take account of symlinks or hard links to tdb files. (This used to be commit 04e1171996612ddb15f84134cadded68f0d173b2) --- source4/include/db_wrap.h | 38 ++++++++++++++++++++++++++++++++++++++ source4/include/includes.h | 1 + 2 files changed, 39 insertions(+) create mode 100644 source4/include/db_wrap.h (limited to 'source4/include') diff --git a/source4/include/db_wrap.h b/source4/include/db_wrap.h new file mode 100644 index 0000000000..50e3af68bd --- /dev/null +++ b/source4/include/db_wrap.h @@ -0,0 +1,38 @@ +/* + Unix SMB/CIFS implementation. + + database wrap headers + + Copyright (C) Andrew Tridgell 2004 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + + +struct ldb_wrap { + struct ldb_context *ldb; + + const char *url; + struct ldb_wrap *next, *prev; +}; + + +struct tdb_wrap { + TDB_CONTEXT *tdb; + + const char *name; + struct tdb_wrap *next, *prev; +}; + diff --git a/source4/include/includes.h b/source4/include/includes.h index 86ddc81e57..85e4299efd 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -619,6 +619,7 @@ extern int errno; #include "lib/tdb/include/spinlock.h" #include "lib/tdb/include/tdbutil.h" #include "talloc.h" +#include "db_wrap.h" #include "nt_status.h" #include "interfaces.h" #include "trans2.h" -- cgit