summaryrefslogtreecommitdiff
path: root/ctdb/client
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2017-08-23 12:09:22 +1000
committerMartin Schwenke <martins@samba.org>2017-08-25 09:41:26 +0200
commit9987fe7209c3bd44ea0015d98d0f92b65ec70700 (patch)
treef5d999a0db9b49afb8effd639e0d0d1f5335b490 /ctdb/client
parent4bd0a20a75db3b3c409c25a4bc59aed30464f047 (diff)
downloadsamba-9987fe7209c3bd44ea0015d98d0f92b65ec70700.tar.gz
ctdb-client: Optionally return database id from ctdb_ctrl_createdb()
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>
Diffstat (limited to 'ctdb/client')
-rw-r--r--ctdb/client/ctdb_client.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 74874bab2b2..05710c964fa 100644
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -1912,7 +1912,7 @@ int ctdb_ctrl_getdbseqnum(struct ctdb_context *ctdb, struct timeval timeout,
*/
int ctdb_ctrl_createdb(struct ctdb_context *ctdb, struct timeval timeout,
uint32_t destnode, TALLOC_CTX *mem_ctx,
- const char *name, uint8_t db_flags)
+ const char *name, uint8_t db_flags, uint32_t *db_id)
{
int ret;
int32_t res;
@@ -1937,6 +1937,15 @@ int ctdb_ctrl_createdb(struct ctdb_context *ctdb, struct timeval timeout,
return -1;
}
+ if (data.dsize != sizeof(uint32_t)) {
+ TALLOC_FREE(data.dptr);
+ return -1;
+ }
+ if (db_id != NULL) {
+ *db_id = *(uint32_t *)data.dptr;
+ }
+ talloc_free(data.dptr);
+
return 0;
}