summaryrefslogtreecommitdiff
path: root/ctdb/protocol
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2015-10-23 19:10:28 +1100
committerMartin Schwenke <martins@samba.org>2015-10-27 04:15:14 +0100
commit42b1d30fbb3fc6bbc06c3a9a1802cab6f2cc769c (patch)
tree7c7a6aa553ed4f0e027bbb3b5893f84614aea98b /ctdb/protocol
parent84b7a9f939f43baf33de4384a8c06687dd4e9c2b (diff)
downloadsamba-42b1d30fbb3fc6bbc06c3a9a1802cab6f2cc769c.tar.gz
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 <amitay@gmail.com> Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/protocol')
-rw-r--r--ctdb/protocol/protocol.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/ctdb/protocol/protocol.h b/ctdb/protocol/protocol.h
index 054bab3ea66..7159071db1d 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;