From: Martin Schwenke <martin@meltin.net>
Date: Tue, 31 May 2016 08:37:30 +0000 (+1000)
Subject: ctdb-recoverd: Don't expose internal cluster mutex status
X-Git-Tag: tdb-1.3.10~929
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dbd4e67aee5c0cd880c3692f66c9f2772f0fb672;p=thirdparty%2Fsamba.git

ctdb-recoverd: Don't expose internal cluster mutex status

Just expose whether the lock was taken.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index c0adebec781..adff56cdce5 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -1548,7 +1548,7 @@ static bool ctdb_recovery_have_lock(struct ctdb_context *ctdb)
 
 struct hold_reclock_state {
 	bool done;
-	char status;
+	bool locked;
 };
 
 static void hold_reclock_handler(struct ctdb_context *ctdb,
@@ -1579,7 +1579,7 @@ static void hold_reclock_handler(struct ctdb_context *ctdb,
 	}
 
 	s->done = true;
-	s->status = status;
+	s->locked = (status == '0') ;
 }
 
 static bool ctdb_recovery_lock(struct ctdb_context *ctdb)
@@ -1587,7 +1587,7 @@ static bool ctdb_recovery_lock(struct ctdb_context *ctdb)
 	struct ctdb_cluster_mutex_handle *h;
 	struct hold_reclock_state s = {
 		.done = false,
-		.status = '0',
+		.locked = false,
 	};
 
 	h = ctdb_cluster_mutex(ctdb, ctdb->recovery_lock, 0);
@@ -1604,7 +1604,7 @@ static bool ctdb_recovery_lock(struct ctdb_context *ctdb)
 	/* Ensure no attempts to access to s after function return */
 	ctdb_cluster_mutex_set_handler(h, hold_reclock_handler, NULL);
 
-	return (s.status == '0');
+	return s.locked;
 }
 
 static void ctdb_recovery_unlock(struct ctdb_context *ctdb)