Add --dbdir to ctdbd. Necessary for shared operation between ctdbd and smbd.

(This used to be ctdb commit bce40105e2ccbca5e364793bbf1a6357e6dd69b2)

ctdb/common/ctdb.c

@@ -73,6 +73,14 @@ void ctdb_set_max_lacount(struct ctdb_context *ctdb, unsigned count)
 	ctdb->max_lacount = count;
 }
 
+/*
+  set the directory for the local databases
+*/
+void ctdb_set_tdb_dir(struct ctdb_context *ctdb, const char *dir)
+{
+	ctdb->db_directory = talloc_strdup(ctdb, dir);
+}
+
 /*
   add a node to the list of active nodes
 */

ctdb/common/ctdb_ltdb.c

@@ -84,7 +84,7 @@ struct ctdb_db_context *ctdb_attach(struct ctdb_context *ctdb, const char *name,
 
 	/* add the node id to the database name, so when we run on loopback
 	   we don't conflict in the local filesystem */
-	name = talloc_asprintf(ctdb_db, "%s.%u", name, ctdb_get_vnn(ctdb));
+	name = talloc_asprintf(ctdb_db, "%s/%s", ctdb->db_directory, name);
 
 	/* when we have a separate daemon this will need to be a real
 	   file, not a TDB_INTERNAL, so the parent can access it to

ctdb/direct/ctdbd.c

@@ -45,12 +45,14 @@ int main(int argc, const char *argv[])
 {
 	struct ctdb_context *ctdb;
 	const char *db_list = "test.tdb";
+	const char *db_dir = ".";
 	char *s, *tok;
 
 	struct poptOption popt_options[] = {
 		POPT_AUTOHELP
 		POPT_CTDB_CMDLINE
 		{ "dblist", 0, POPT_ARG_STRING, &db_list, 0, "list of databases", NULL },
+		{ "dbdir", 0, POPT_ARG_STRING, &db_dir, 0, "directory for the tdb files", NULL },
 		POPT_TABLEEND
 	};
 	int opt;
@@ -84,6 +86,8 @@ int main(int argc, const char *argv[])
 
 	ctdb = ctdb_cmdline_init(ev);
 
+	ctdb_set_tdb_dir(ctdb, db_dir);
+
 	/* attach to the list of databases */
 	s = talloc_strdup(ctdb, db_list);
 	for (tok=strtok(s, ", "); tok; tok=strtok(NULL, ", ")) {

ctdb/include/ctdb.h

@@ -71,6 +71,11 @@ struct ctdb_context *ctdb_init(struct event_context *ev);
 */
 int ctdb_set_transport(struct ctdb_context *ctdb, const char *transport);
 
+/*
+  set the directory for the local databases
+*/
+void ctdb_set_tdb_dir(struct ctdb_context *ctdb, const char *dir);
+
 /*
   set some flags
 */

ctdb/include/ctdb_private.h

@@ -119,6 +119,7 @@ struct ctdb_context {
 	struct event_context *ev;
 	struct ctdb_address address;
 	const char *name;
+	const char *db_directory;
 	uint32_t vnn; /* our own vnn */
 	uint32_t num_nodes;
 	uint32_t num_connected;