The branch, master has been updated
via cbae31c build: --picky-developer implies --enable-developer
via 151a7da ctdb-build: Define CTDB_SOCKET at configure time
via af99846 ctdb-tool: Remove repack command
via 47cddb6 ctdb-ib: Fix build for infiniband transport
via 42b1d30 ctdb-daemon: Keep protocol.h in sync with ctdb_protocol.h
from 84b7a9f build:wafsamba: dead code removal in gettext detection
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit cbae31c7946fc13c3a00bc81a102e90fdec00018
Author: Martin Schwenke <[email protected]>
Date: Tue Oct 27 12:06:25 2015 +1100
build: --picky-developer implies --enable-developer
Have --picky-developer enable --enable-developer too, instead of
requiring both options to be specified. This makes it obey the
principle of least surprise.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
Autobuild-User(master): Martin Schwenke <[email protected]>
Autobuild-Date(master): Tue Oct 27 07:19:33 CET 2015 on sn-devel-104
commit 151a7dabd5f6bf7560c701cc1cfcde4c63f5b6d9
Author: Amitay Isaacs <[email protected]>
Date: Mon Oct 26 15:58:36 2015 +1100
ctdb-build: Define CTDB_SOCKET at configure time
Currently only Samba is built with CTDB and since CTDB headers are not
public any more, no other application can build with CTDB. So define
CTDB_SOCKET only during build.
In future CTDB will have public API and proper way of figuring out
CTDB_SOCKET.
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
commit af99846ac58fed268bee8b35e331a05174f547e0
Author: Amitay Isaacs <[email protected]>
Date: Fri Oct 23 14:24:48 2015 +1100
ctdb-tool: Remove repack command
The databases are repacked automatically during vacuuming when the
freelist size grows beyond configured threshold (RepackLimit).
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
commit 47cddb699a28560556ed7db8eb829628407f2e22
Author: Amitay Isaacs <[email protected]>
Date: Tue Oct 13 16:19:21 2015 +1100
ctdb-ib: Fix build for infiniband transport
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
commit 42b1d30fbb3fc6bbc06c3a9a1802cab6f2cc769c
Author: Amitay Isaacs <[email protected]>
Date: Fri Oct 23 19:10:28 2015 +1100
ctdb-daemon: Keep protocol.h in sync with ctdb_protocol.h
ctdb_protocol.h was modified to update default capabilities without
corresponding changes in protocol.h.
(Patch dfc84fdd45a9bd763289b4965bc2d0a3e7071ff0)
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wscript | 6 +-
ctdb/ib/ibw_ctdb.c | 11 +--
ctdb/ib/ibw_ctdb_init.c | 10 +--
ctdb/ib/ibwrapper_test.c | 30 +++----
ctdb/include/ctdb_private.h | 3 -
ctdb/include/ctdb_protocol.h | 7 --
ctdb/protocol/protocol.h | 6 +-
ctdb/tests/src/ctdb_test.c | 1 -
ctdb/tools/ctdb.c | 1 -
ctdb/tools/ctdb_vacuum.c | 193 -------------------------------------------
ctdb/wscript | 10 +--
11 files changed, 33 insertions(+), 245 deletions(-)
delete mode 100644 ctdb/tools/ctdb_vacuum.c
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index f3e019c..5bce17d 100755
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -96,9 +96,13 @@ def set_options(opt):
gr.add_option('--enable-developer',
help=("Turn on developer warnings and debugging"),
action="store_true", dest='developer', default=False)
+ def picky_developer_callback(option, opt_str, value, parser):
+ parser.values.developer = True
+ parser.values.picky_developer = True
gr.add_option('--picky-developer',
help=("Treat all warnings as errors (enable -Werror)"),
- action="store_true", dest='picky_developer', default=False)
+ action="callback", callback=picky_developer_callback,
+ dest='picky_developer', default=False)
gr.add_option('--fatal-errors',
help=("Stop compilation on first error (enable
-Wfatal-errors)"),
action="store_true", dest='fatal_errors', default=False)
diff --git a/ctdb/ib/ibw_ctdb.c b/ctdb/ib/ibw_ctdb.c
index 2e70d1d..438bf69 100644
--- a/ctdb/ib/ibw_ctdb.c
+++ b/ctdb/ib/ibw_ctdb.c
@@ -49,17 +49,8 @@ int ctdb_ibw_node_connect(struct ctdb_node *node)
assert(cn!=NULL);
assert(cn->conn!=NULL);
- struct sockaddr_in sock_out;
-
- memset(&sock_out, 0, sizeof(struct sockaddr_in));
- sock_out.sin_port = htons(node->address.port);
- sock_out.sin_family = PF_INET;
- if (ctdb_ibw_get_address(node->ctdb, node->address.address,
&sock_out.sin_addr)) {
- DEBUG(DEBUG_ERR, ("ctdb_ibw_node_connect failed\n"));
- return -1;
- }
- rc = ibw_connect(cn->conn, &sock_out, node);
+ rc = ibw_connect(cn->conn, &node->address.ip, node);
if (rc) {
DEBUG(DEBUG_ERR, ("ctdb_ibw_node_connect/ibw_connect failed -
retrying...\n"));
/* try again once a second */
diff --git a/ctdb/ib/ibw_ctdb_init.c b/ctdb/ib/ibw_ctdb_init.c
index 63deff2..b71909a 100644
--- a/ctdb/ib/ibw_ctdb_init.c
+++ b/ctdb/ib/ibw_ctdb_init.c
@@ -31,16 +31,10 @@
static int ctdb_ibw_listen(struct ctdb_context *ctdb, int backlog)
{
struct ibw_ctx *ictx = talloc_get_type(ctdb->private_data, struct
ibw_ctx);
- struct sockaddr_in my_addr;
assert(ictx!=NULL);
- memset(&my_addr, 0, sizeof(struct sockaddr_in));
- my_addr.sin_port = htons(ctdb->address.port);
- my_addr.sin_family = PF_INET;
- if (ctdb_ibw_get_address(ctdb, ctdb->address.address,
&my_addr.sin_addr))
- return -1;
- if (ibw_bind(ictx, &my_addr)) {
+ if (ibw_bind(ictx, &ctdb->address->ip)) {
DEBUG(DEBUG_CRIT, ("ctdb_ibw_listen: ibw_bind failed\n"));
return -1;
}
@@ -105,7 +99,7 @@ static int ctdb_ibw_start(struct ctdb_context *ctdb)
/* everything async here */
for (i=0;i<ctdb->num_nodes;i++) {
struct ctdb_node *node = ctdb->nodes[i];
- if (!ctdb_same_address(&ctdb->address, &node->address)) {
+ if (!ctdb_same_address(ctdb->address, &node->address)) {
ctdb_ibw_node_connect(node);
}
}
diff --git a/ctdb/ib/ibwrapper_test.c b/ctdb/ib/ibwrapper_test.c
index 397fdf1..a006966 100644
--- a/ctdb/ib/ibwrapper_test.c
+++ b/ctdb/ib/ibwrapper_test.c
@@ -77,7 +77,7 @@ enum testopcode {
TESTOP_SEND_RND = 3
};
-int ibwtest_connect_everybody(struct ibwtest_ctx *tcx)
+static int ibwtest_connect_everybody(struct ibwtest_ctx *tcx)
{
struct ibw_conn *conn;
struct ibwtest_conn *tconn = talloc_zero(tcx, struct ibwtest_conn);
@@ -95,7 +95,7 @@ int ibwtest_connect_everybody(struct ibwtest_ctx *tcx)
return 0;
}
-int ibwtest_send_id(struct ibw_conn *conn)
+static int ibwtest_send_id(struct ibw_conn *conn)
{
struct ibwtest_ctx *tcx = talloc_get_type(conn->ctx->ctx_userdata,
struct ibwtest_ctx);
char *buf;
@@ -123,7 +123,7 @@ int ibwtest_send_id(struct ibw_conn *conn)
return 0;
}
-int ibwtest_send_test_msg(struct ibwtest_ctx *tcx, struct ibw_conn *conn,
const char *msg)
+static int ibwtest_send_test_msg(struct ibwtest_ctx *tcx, struct ibw_conn
*conn, const char *msg)
{
char *buf, *p;
void *key;
@@ -154,7 +154,7 @@ int ibwtest_send_test_msg(struct ibwtest_ctx *tcx, struct
ibw_conn *conn, const
return 0;
}
-unsigned char ibwtest_fill_random(unsigned char *buf, uint32_t size)
+static unsigned char ibwtest_fill_random(unsigned char *buf, uint32_t size)
{
uint32_t i = size;
unsigned char sum = 0;
@@ -168,7 +168,7 @@ unsigned char ibwtest_fill_random(unsigned char *buf,
uint32_t size)
return sum;
}
-unsigned char ibwtest_get_sum(unsigned char *buf, uint32_t size)
+static unsigned char ibwtest_get_sum(unsigned char *buf, uint32_t size)
{
uint32_t i = size;
unsigned char sum = 0;
@@ -180,7 +180,7 @@ unsigned char ibwtest_get_sum(unsigned char *buf, uint32_t
size)
return sum;
}
-int ibwtest_do_varsize_scenario_conn_size(struct ibwtest_ctx *tcx, struct
ibw_conn *conn, uint32_t size)
+static int ibwtest_do_varsize_scenario_conn_size(struct ibwtest_ctx *tcx,
struct ibw_conn *conn, uint32_t size)
{
unsigned char *buf;
void *key;
@@ -205,7 +205,7 @@ int ibwtest_do_varsize_scenario_conn_size(struct
ibwtest_ctx *tcx, struct ibw_co
return 0;
}
-int ibwtest_do_varsize_scenario_conn(struct ibwtest_ctx *tcx, struct ibw_conn
*conn)
+static int ibwtest_do_varsize_scenario_conn(struct ibwtest_ctx *tcx, struct
ibw_conn *conn)
{
uint32_t size;
int i;
@@ -234,7 +234,7 @@ int ibwtest_do_varsize_scenario_conn(struct ibwtest_ctx
*tcx, struct ibw_conn *c
}
}*/
-int ibwtest_connstate_handler(struct ibw_ctx *ctx, struct ibw_conn *conn)
+static int ibwtest_connstate_handler(struct ibw_ctx *ctx, struct ibw_conn
*conn)
{
struct ibwtest_ctx *tcx = NULL; /* userdata */
struct ibwtest_conn *tconn = NULL; /* userdata */
@@ -298,7 +298,7 @@ int ibwtest_connstate_handler(struct ibw_ctx *ctx, struct
ibw_conn *conn)
return 0;
}
-int ibwtest_receive_handler(struct ibw_conn *conn, void *buf, int n)
+static int ibwtest_receive_handler(struct ibw_conn *conn, void *buf, int n)
{
struct ibwtest_conn *tconn;
enum testopcode op;
@@ -375,7 +375,7 @@ error:
return -1;
}
-void ibwtest_timeout_handler(struct event_context *ev, struct timed_event *te,
+static void ibwtest_timeout_handler(struct event_context *ev, struct
timed_event *te,
struct timeval t, void *private_data)
{
struct ibwtest_ctx *tcx = talloc_get_type(private_data, struct
ibwtest_ctx);
@@ -401,7 +401,7 @@ void ibwtest_timeout_handler(struct event_context *ev,
struct timed_event *te,
static struct ibwtest_ctx *testctx = NULL;
-void ibwtest_sigint_handler(int sig)
+static void ibwtest_sigint_handler(int sig)
{
DEBUG(DEBUG_ERR, ("got SIGINT\n"));
if (testctx) {
@@ -422,7 +422,7 @@ void ibwtest_sigint_handler(int sig)
}
}
-int ibwtest_parse_attrs(struct ibwtest_ctx *tcx, char *optext,
+static int ibwtest_parse_attrs(struct ibwtest_ctx *tcx, char *optext,
struct ibw_initattr **pattrs, int *nattrs, char op)
{
int i = 0, n = 1;
@@ -477,7 +477,7 @@ static int ibwtest_get_address(const char *address, struct
in_addr *addr)
return 0;
}
-int ibwtest_getdests(struct ibwtest_ctx *tcx, char op)
+static int ibwtest_getdests(struct ibwtest_ctx *tcx, char op)
{
int i;
struct ibw_initattr *attrs = NULL;
@@ -503,7 +503,7 @@ int ibwtest_getdests(struct ibwtest_ctx *tcx, char op)
return 0;
}
-int ibwtest_init_server(struct ibwtest_ctx *tcx)
+static int ibwtest_init_server(struct ibwtest_ctx *tcx)
{
if (tcx->naddrs!=1) {
fprintf(stderr, "incorrect number of addrs(%d!=1)\n",
tcx->naddrs);
@@ -524,7 +524,7 @@ int ibwtest_init_server(struct ibwtest_ctx *tcx)
return 0;
}
-void ibwtest_usage(struct ibwtest_ctx *tcx, char *name)
+static void ibwtest_usage(struct ibwtest_ctx *tcx, char *name)
{
printf("Usage:\n");
printf("\t%s -i <id> -o {name:value} -d {addr:port} -t nsec -s\n",
name);
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 5702ad1..74a155c 100644
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -1264,9 +1264,6 @@ int32_t ctdb_control_db_get_health(struct ctdb_context
*ctdb,
TDB_DATA indata,
TDB_DATA *outdata);
-
-int ctdb_repack(struct ctdb_context *ctdb, int argc, const char **argv);
-
int32_t ctdb_monitoring_mode(struct ctdb_context *ctdb);
bool ctdb_stopped_monitoring(struct ctdb_context *ctdb);
int ctdb_set_child_logging(struct ctdb_context *ctdb);
diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index bb0056e..750abc4 100644
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -22,13 +22,6 @@
#include <sys/socket.h>
-/* location of daemon socket, set at configure time */
-#ifdef SOCKPATH
-#define CTDB_SOCKET SOCKPATH
-#else
-#define CTDB_SOCKET "/var/run/ctdb/ctdbd.socket"
-#endif
-
/* default ctdb port number */
#define CTDB_PORT 4379
diff --git a/ctdb/protocol/protocol.h b/ctdb/protocol/protocol.h
index 054bab3..7159071 100644
--- a/ctdb/protocol/protocol.h
+++ b/ctdb/protocol/protocol.h
@@ -703,7 +703,11 @@ struct ctdb_public_ip_list {
*/
#define CTDB_CAP_PARALLEL_RECOVERY 0x00010000
-#define CTDB_CAP_DEFAULT (CTDB_CAP_PARALLEL_RECOVERY)
+#define CTDB_CAP_FEATURES (CTDB_CAP_PARALLEL_RECOVERY)
+
+#define CTDB_CAP_DEFAULT (CTDB_CAP_RECMASTER | \
+ CTDB_CAP_LMASTER | \
+ CTDB_CAP_FEATURES)
struct ctdb_node_and_flags {
uint32_t pnn;
diff --git a/ctdb/tests/src/ctdb_test.c b/ctdb/tests/src/ctdb_test.c
index 1ebd02b..33f198a 100644
--- a/ctdb/tests/src/ctdb_test.c
+++ b/ctdb/tests/src/ctdb_test.c
@@ -167,7 +167,6 @@ ctdb_get_capabilities(struct ctdb_context *ctdb,
struct ctdb_node_map *nodemap);
#undef TIMELIMIT
-#include "tools/ctdb_vacuum.c"
/* CTDB_COMMON_OBJ */
#include "common/ctdb_io.c"
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index d50e5e9..013a484 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -6524,7 +6524,6 @@ static const struct {
{ "chksrvid", chksrvid, false, false, "check
if a server id exists", "<pnn> <type> <id>" },
{ "getsrvids", getsrvids, false, false, "get a
list of all server ids"},
{ "check_srvids", check_srvids, false, false, "check
if a srvid exists", "<id>+" },
- { "repack", ctdb_repack, false, false, "repack
all databases", "[max_freelist]"},
{ "listnodes", control_listnodes, false, true, "list all
nodes in the cluster"},
{ "reloadnodes", control_reload_nodes_file, false, false, "reload
the nodes file and restart the transport on all nodes"},
{ "moveip", control_moveip, false, false,
"move/failover an ip address to another node", "<ip> <node>"},
diff --git a/ctdb/tools/ctdb_vacuum.c b/ctdb/tools/ctdb_vacuum.c
deleted file mode 100644
index ae93682..0000000
--- a/ctdb/tools/ctdb_vacuum.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- ctdb control tool - database vacuum
-
- Copyright (C) Andrew Tridgell 2008
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "system/filesys.h"
-#include "system/network.h"
-#include "../include/ctdb_client.h"
-#include "../include/ctdb_private.h"
-#include "../common/rb_tree.h"
-#include "lib/tdb_wrap/tdb_wrap.h"
-
-/* should be tunable */
-#define TIMELIMIT() timeval_current_ofs(10, 0)
-
-
-struct vacuum_traverse_state {
- bool error;
- struct tdb_context *dest_db;
-};
-
-/*
- traverse function for repacking
- */
-static int repack_traverse(struct tdb_context *tdb, TDB_DATA key, TDB_DATA
data, void *private)
-{
- struct vacuum_traverse_state *state = (struct vacuum_traverse_state
*)private;
- if (tdb_store(state->dest_db, key, data, TDB_INSERT) != 0) {
- state->error = true;
- return -1;
- }
- return 0;
-}
-
-/*
- repack a tdb
- */
-static int ctdb_repack_tdb(struct tdb_context *tdb)
-{
- struct tdb_context *tmp_db;
- struct vacuum_traverse_state state;
-
- if (tdb_transaction_start(tdb) != 0) {
- DEBUG(DEBUG_ERR,(__location__ " Failed to start
transaction\n"));
- return -1;
- }
-
- tmp_db = tdb_open("tmpdb", tdb_hash_size(tdb),
- TDB_INTERNAL|TDB_DISALLOW_NESTING,
- O_RDWR|O_CREAT, 0);
- if (tmp_db == NULL) {
- DEBUG(DEBUG_ERR,(__location__ " Failed to create tmp_db\n"));
- tdb_transaction_cancel(tdb);
- return -1;
- }
-
- state.error = false;
- state.dest_db = tmp_db;
-
- if (tdb_traverse_read(tdb, repack_traverse, &state) == -1) {
- DEBUG(DEBUG_ERR,(__location__ " Failed to traverse copying
out\n"));
- tdb_transaction_cancel(tdb);
- tdb_close(tmp_db);
- return -1;
- }
-
- if (state.error) {
- DEBUG(DEBUG_ERR,(__location__ " Error during traversal\n"));
- tdb_transaction_cancel(tdb);
- tdb_close(tmp_db);
- return -1;
- }
-
- if (tdb_wipe_all(tdb) != 0) {
- DEBUG(DEBUG_ERR,(__location__ " Failed to wipe database\n"));
- tdb_transaction_cancel(tdb);
- tdb_close(tmp_db);
- return -1;
- }
-
- state.error = false;
- state.dest_db = tdb;
-
- if (tdb_traverse_read(tmp_db, repack_traverse, &state) == -1) {
- DEBUG(DEBUG_ERR,(__location__ " Failed to traverse copying
back\n"));
- tdb_transaction_cancel(tdb);
- tdb_close(tmp_db);
- return -1;
- }
-
- if (state.error) {
- DEBUG(DEBUG_ERR,(__location__ " Error during second
traversal\n"));
- tdb_transaction_cancel(tdb);
- tdb_close(tmp_db);
- return -1;
- }
-
- tdb_close(tmp_db);
-
- if (tdb_transaction_commit(tdb) != 0) {
- DEBUG(DEBUG_ERR,(__location__ " Failed to commit\n"));
- return -1;
- }
-
- return 0;
-}
-
-
-/* repack one database */
-static int ctdb_repack_db(struct ctdb_context *ctdb, uint32_t db_id,
- bool persistent, uint32_t repack_limit)
-{
- struct ctdb_db_context *ctdb_db;
- const char *name;
- int size;
-
- if (ctdb_ctrl_getdbname(ctdb, TIMELIMIT(), CTDB_CURRENT_NODE, db_id,
ctdb, &name) != 0) {
- DEBUG(DEBUG_ERR,(__location__ " Failed to get name of db
0x%x\n", db_id));
- return -1;
- }
-
- ctdb_db = ctdb_attach(ctdb, TIMELIMIT(), name, persistent, 0);
- if (ctdb_db == NULL) {
- DEBUG(DEBUG_ERR,(__location__ " Failed to attach to database
'%s'\n", name));
- return -1;
- }
-
- size = tdb_freelist_size(ctdb_db->ltdb->tdb);
- if (size == -1) {
- DEBUG(DEBUG_ERR,(__location__ " Failed to get freelist size for
'%s'\n", name));
- return -1;
- }
-
- if (size <= repack_limit) {
- return 0;
- }
-
- printf("Repacking %s with %u freelist entries\n", name, size);
-
- if (ctdb_repack_tdb(ctdb_db->ltdb->tdb) != 0) {
- DEBUG(DEBUG_ERR,(__location__ " Failed to repack '%s'\n",
name));
- return -1;
- }
-
- return 0;
-}
-
-
-/*
- repack all our databases
- */
-int ctdb_repack(struct ctdb_context *ctdb, int argc, const char **argv)
-{
- struct ctdb_dbid_map *dbmap=NULL;
- int ret, i;
- /* a reasonable default limit to prevent us using too much memory */
- uint32_t repack_limit = 10000;
-
- if (argc > 0) {
- repack_limit = atoi(argv[0]);
- }
-
- ret = ctdb_ctrl_getdbmap(ctdb, TIMELIMIT(), CTDB_CURRENT_NODE, ctdb,
&dbmap);
- if (ret != 0) {
- DEBUG(DEBUG_ERR, ("Unable to get dbids from local node\n"));
- return ret;
- }
-
- for (i=0;i<dbmap->num;i++) {
- if (ctdb_repack_db(ctdb, dbmap->dbs[i].dbid,
- dbmap->dbs[i].flags &
CTDB_DB_FLAGS_PERSISTENT, repack_limit) != 0) {
- DEBUG(DEBUG_ERR,("Failed to repack db 0x%x\n",
dbmap->dbs[i].dbid));
- return -1;
- }
- }
-
- return 0;
-}
diff --git a/ctdb/wscript b/ctdb/wscript
index 0dc4adc..3e97274 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -192,16 +192,15 @@ def configure(conf):
else:
conf.env.CTDB_SOCKPATH = os.path.join(conf.env.CTDB_RUNDIR,
'ctdbd.socket')
+ conf.define('CTDB_SOCKET', conf.env.CTDB_SOCKPATH)
conf.ADD_CFLAGS('''-DCTDB_HELPER_BINDIR=\"%s\"
-DLOGDIR=\"%s\"
- -DSOCKPATH=\"%s\"
-DCTDB_ETCDIR=\"%s\"
-DCTDB_VARDIR=\"%s\"
-DCTDB_RUNDIR=\"%s\"''' % (
--
Samba Shared Repository
