From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Wed, 6 Jun 2007 23:27:51 +0000 (+1000)
Subject: show the disabled/permanently disabled status in the machinereadble
X-Git-Tag: tevent-0.9.20~348^2~2544^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d93c6f8db2e9e40bd04b67a3dd97507c9b688c35;p=thirdparty%2Fsamba.git

show the disabled/permanently disabled status in the machinereadble
output for 'ctdb status'

(This used to be ctdb commit a9e920a492e1e91d205ee8b9cd704a7cf85c1e01)
---

diff --git a/ctdb/tools/ctdb_control.c b/ctdb/tools/ctdb_control.c
index b0771689ee0..94c5be3b41d 100644
--- a/ctdb/tools/ctdb_control.c
+++ b/ctdb/tools/ctdb_control.c
@@ -285,11 +285,13 @@ static int control_status(struct ctdb_context *ctdb, int argc, const char **argv
 	}
 
 	if(options.machinereadable){
-		printf(":Node:IP:Status:\n");
+		printf(":Node:IP:Connected:Disabled:Permanently Disabled:\n");
 		for(i=0;i<nodemap->num;i++){
-			printf(":%d:%s:%d:\n", nodemap->nodes[i].vnn,
+			printf(":%d:%s:%d:%d:%d:\n", nodemap->nodes[i].vnn,
 				inet_ntoa(nodemap->nodes[i].sin.sin_addr),
-				!!nodemap->nodes[i].flags&NODE_FLAGS_CONNECTED);
+				!!(nodemap->nodes[i].flags&NODE_FLAGS_CONNECTED),
+				!!(nodemap->nodes[i].flags&NODE_FLAGS_DISABLED),
+				!!(nodemap->nodes[i].flags&NODE_FLAGS_PERMANENTLY_DISABLED));
 		}
 		return 0;
 	}