diff options
| author | Michael Adam <obnox@samba.org> | 2011-10-13 16:50:57 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-10-13 18:50:47 +0200 |
| commit | 71f5f41860e678e6151b969a05729ccf2d738e35 (patch) | |
| tree | c0bb95a53deaf4fb95071c99ef070879527fc952 /source3 | |
| parent | e287a72e657988c87166b0b468836d94b073b14e (diff) | |
| download | samba-71f5f41860e678e6151b969a05729ccf2d738e35.tar.gz samba-71f5f41860e678e6151b969a05729ccf2d738e35.tar.bz2 samba-71f5f41860e678e6151b969a05729ccf2d738e35.zip | |
s3:dbwrap_ctdb: fix the build after changing signature of tdb_wrap_open()
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Thu Oct 13 18:50:47 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/dbwrap/dbwrap_ctdb.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c index 4c5cd64da0..e0f98cc47d 100644 --- a/source3/lib/dbwrap/dbwrap_ctdb.c +++ b/source3/lib/dbwrap/dbwrap_ctdb.c @@ -23,6 +23,7 @@ #include "lib/util/tdb_wrap.h" #include "util_tdb.h" #include "dbwrap/dbwrap_rbt.h" +#include "lib/param/param.h" #ifdef CLUSTER_SUPPORT @@ -1428,6 +1429,7 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx, struct db_ctdb_ctx *db_ctdb; char *db_path; struct ctdbd_connection *conn; + struct loadparm_context *lp_ctx; if (!lp_clustering()) { DEBUG(10, ("Clustering disabled -- no ctdb\n")); @@ -1474,7 +1476,11 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx, chmod(db_path, mode); } - db_ctdb->wtdb = tdb_wrap_open(db_ctdb, db_path, hash_size, tdb_flags, O_RDWR, 0); + lp_ctx = loadparm_init_s3(db_path, loadparm_s3_context()); + + db_ctdb->wtdb = tdb_wrap_open(db_ctdb, db_path, hash_size, tdb_flags, + O_RDWR, 0, lp_ctx); + talloc_unlink(db_path, lp_ctx); if (db_ctdb->wtdb == NULL) { DEBUG(0, ("Could not open tdb %s: %s\n", db_path, strerror(errno))); TALLOC_FREE(result); |