summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-06-22 15:07:43 +0930
committerRusty Russell <rusty@rustcorp.com.au>2012-06-22 07:35:17 +0200
commit9d97bf3f47a591a71e96cad8a87ef13a2b277c9c (patch)
treef78151ab3e9a9ea72f89f933652669035272ff88 /source3
parent1acf548eb75c9641e4e2c07167b42bc4380f9158 (diff)
downloadsamba-9d97bf3f47a591a71e96cad8a87ef13a2b277c9c.tar.gz
samba-9d97bf3f47a591a71e96cad8a87ef13a2b277c9c.tar.bz2
samba-9d97bf3f47a591a71e96cad8a87ef13a2b277c9c.zip
dbwrap: dbwrap_local_open()
This simply opens a tdb: it will eventually switch depending on the extension. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in1
-rw-r--r--source3/lib/dbwrap/dbwrap_open.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index d66f6bfd99..abdeb72d62 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -263,6 +263,7 @@ EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@
TDB_LIB_OBJ = lib/util_tdb.o ../lib/util/util_tdb.o \
../lib/tdb_wrap/tdb_wrap.o \
../lib/dbwrap/dbwrap.o \
+ ../lib/dbwrap/dbwrap_local_open.o \
lib/dbwrap/dbwrap_open.o \
../lib/dbwrap/dbwrap_tdb.o \
lib/dbwrap/dbwrap_ctdb.o \
diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c
index b7e6bd586f..e5adab7eaa 100644
--- a/source3/lib/dbwrap/dbwrap_open.c
+++ b/source3/lib/dbwrap/dbwrap_open.c
@@ -119,9 +119,9 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx,
if (result == NULL) {
struct loadparm_context *lp_ctx = loadparm_init_s3(mem_ctx, loadparm_s3_context());
- result = db_open_tdb(mem_ctx, lp_ctx, name, hash_size,
- tdb_flags, open_flags, mode,
- lock_order);
+ result = dbwrap_local_open(mem_ctx, lp_ctx, name, hash_size,
+ tdb_flags, open_flags, mode,
+ lock_order);
talloc_unlink(mem_ctx, lp_ctx);
}
return result;