diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-10-21 19:36:36 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-10-25 12:06:06 +1100 |
| commit | a604c3d945303d58ce12f20de6a3a6fad1493f49 (patch) | |
| tree | bc303d295dadc2e02637265d7c7f78b8f91718d1 /ctdb/server/ctdbd.c | |
| parent | bd73e017b0d4943a35da95eef7f1a88a96f21648 (diff) | |
| download | samba-a604c3d945303d58ce12f20de6a3a6fad1493f49.tar.gz samba-a604c3d945303d58ce12f20de6a3a6fad1493f49.tar.xz samba-a604c3d945303d58ce12f20de6a3a6fad1493f49.zip | |
ctdbd: Remove duplicate database directory setting logic
Defaults for ctdb->db_directory and similar variables are currently
set in 2 places.
Change this to set them in only 1 place and make the directories at
initialisation time instead of waiting until later.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Pair-programmed-with: Amitay Isaacs <amitay@gmail.com>
(This used to be ctdb commit d73d84346488a2ed54e6a86f9d7ec641c8e33ace)
Diffstat (limited to 'ctdb/server/ctdbd.c')
| -rw-r--r-- | ctdb/server/ctdbd.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index f3cb9d3e95f..f9e83f8c3f8 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -263,6 +263,8 @@ int main(int argc, const char *argv[]) exit(1); } } + ctdb_mkdir_p_or_die(ctdb, ctdb->db_directory, 0700); + if (options.db_dir_persistent) { ret = ctdb_set_tdb_dir_persistent(ctdb, options.db_dir_persistent); if (ret == -1) { @@ -270,6 +272,8 @@ int main(int argc, const char *argv[]) exit(1); } } + ctdb_mkdir_p_or_die(ctdb, ctdb->db_directory_persistent, 0700); + if (options.db_dir_state) { ret = ctdb_set_tdb_dir_state(ctdb, options.db_dir_state); if (ret == -1) { @@ -277,6 +281,7 @@ int main(int argc, const char *argv[]) exit(1); } } + ctdb_mkdir_p_or_die(ctdb, ctdb->db_directory_state, 0700); if (options.public_interface) { ctdb->default_public_interface = talloc_strdup(ctdb, options.public_interface); |