diff options
author | Amitay Isaacs <amitay@gmail.com> | 2017-08-18 13:50:39 +1000 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2017-08-28 11:04:16 +0200 |
commit | da1aad0590fa005d3f166cc1f472d56790b16053 (patch) | |
tree | 535adb48738885e20f8dac9e24f0144c6dc225d3 /ctdb/server | |
parent | 29270b0e194b7aef71166b72d36b26f418ebe5b8 (diff) | |
download | samba-da1aad0590fa005d3f166cc1f472d56790b16053.tar.gz |
ctdb-client: Fix ctdb_ctrl_createdb() to use database flags
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12978
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
(cherry picked from commit 4bd0a20a75db3b3c409c25a4bc59aed30464f047)
Diffstat (limited to 'ctdb/server')
-rw-r--r-- | ctdb/server/ctdb_recoverd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index b57be0634b8..05aee463bef 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -472,7 +472,7 @@ static int create_missing_remote_databases(struct ctdb_context *ctdb, struct ctd ret = ctdb_ctrl_createdb(ctdb, CONTROL_TIMEOUT(), nodemap->nodes[j].pnn, mem_ctx, name, - dbmap->dbs[db].flags & CTDB_DB_FLAGS_PERSISTENT); + dbmap->dbs[db].flags); if (ret != 0) { DEBUG(DEBUG_ERR, (__location__ " Unable to create remote db:%s\n", name)); return -1; @@ -534,8 +534,9 @@ static int create_missing_local_databases(struct ctdb_context *ctdb, struct ctdb nodemap->nodes[j].pnn)); return -1; } - ctdb_ctrl_createdb(ctdb, CONTROL_TIMEOUT(), pnn, mem_ctx, name, - remote_dbmap->dbs[db].flags & CTDB_DB_FLAGS_PERSISTENT); + ctdb_ctrl_createdb(ctdb, CONTROL_TIMEOUT(), pnn, + mem_ctx, name, + remote_dbmap->dbs[db].flags); if (ret != 0) { DEBUG(DEBUG_ERR, (__location__ " Unable to create local db:%s\n", name)); return -1; |