The branch, master has been updated via a9511cf5ecd5bc39b0070f0afa8ac4d4926c6cab (commit) from f92b9c83a2f39fba9a141417a88de96fc8c592ff (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit a9511cf5ecd5bc39b0070f0afa8ac4d4926c6cab Author: Amitay Isaacs <ami...@gmail.com> Date: Mon Oct 22 09:01:27 2012 +1100 build: Set CTDB_PATH to /tmp/ctdb.socket if SOCKPATH is not defined When building samba with CTDB, if samba configure/waf does not support setting of SOCKPATH, fallback to /tmp/ctdb.socket. Signed-off-by: Amitay Isaacs <ami...@gmail.com> ----------------------------------------------------------------------- Summary of changes: include/ctdb_protocol.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/include/ctdb_protocol.h b/include/ctdb_protocol.h index 022a8fe..327ca92 100644 --- a/include/ctdb_protocol.h +++ b/include/ctdb_protocol.h @@ -21,7 +21,11 @@ #define _CTDB_PROTOCOL_H /* location of daemon socket, set at configure time */ -#define CTDB_PATH SOCKPATH +#ifdef SOCKPATH +#define CTDB_PATH SOCKPATH +#else +#define CTDB_PATH "/tmp/ctdb.socket" +#endif /* default ctdb port number */ #define CTDB_PORT 4379 -- CTDB repository