diff options
author | Andrew Tridgell <tridge@samba.org> | 2007-08-08 03:18:51 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:01:33 -0500 |
commit | b7b3e3e0d40f257942ec528cf069b3451caa699f (patch) | |
tree | 45938f6134a503ffb6990f72daf29464ac015371 /source4/cluster/ctdb/opendb_ctdb.c | |
parent | edca65915afbfde51ab75a27d5ebcb5ab0c85f20 (diff) | |
download | samba-b7b3e3e0d40f257942ec528cf069b3451caa699f.tar.gz samba-b7b3e3e0d40f257942ec528cf069b3451caa699f.tar.bz2 samba-b7b3e3e0d40f257942ec528cf069b3451caa699f.zip |
r24274: - merge from ctdb bzr tree
- use ctdb_attach() instead of ctdb_db_handle()
- make ctdb_attach() return an existing db handle if it exists
(This used to be commit be85c48f8d4a22fd4ed922be6f7f1979f349d291)
Diffstat (limited to 'source4/cluster/ctdb/opendb_ctdb.c')
-rw-r--r-- | source4/cluster/ctdb/opendb_ctdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/cluster/ctdb/opendb_ctdb.c b/source4/cluster/ctdb/opendb_ctdb.c index ed047b76ba..f894af839e 100644 --- a/source4/cluster/ctdb/opendb_ctdb.c +++ b/source4/cluster/ctdb/opendb_ctdb.c @@ -86,7 +86,7 @@ static struct odb_context *odb_ctdb_init(TALLOC_CTX *mem_ctx, } odb->ctdb = ctdb; - odb->ctdb_db = ctdb_db_handle(ctdb, "opendb"); + odb->ctdb_db = ctdb_attach(ctdb, "opendb"); if (!odb->ctdb_db) { DEBUG(0,("Failed to get attached ctdb db handle for opendb\n")); talloc_free(odb); |