From: Amitay Isaacs <amitay@gmail.com>
Date: Tue, 29 Nov 2016 06:13:41 +0000 (+1100)
Subject: ctdb-locking: Remove support for locking multiple databases
X-Git-Tag: talloc-2.1.9~421
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b1076dc61f5e3f006c1b8cef98e7d2d3cc1bfba;p=thirdparty%2Fsamba.git

ctdb-locking: Remove support for locking multiple databases

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12469

The code to lock multiple databases has been dropped from ctdb_lock.c.

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

diff --git a/ctdb/server/ctdb_lock_helper.c b/ctdb/server/ctdb_lock_helper.c
index 34823fb9153..6627412f38e 100644
--- a/ctdb/server/ctdb_lock_helper.c
+++ b/ctdb/server/ctdb_lock_helper.c
@@ -73,7 +73,7 @@ static void usage(void)
 {
 	fprintf(stderr, "\n");
 	fprintf(stderr, "Usage: %s <ctdbd-pid> <output-fd> RECORD <db-path> <db-flags> <db-key>\n", progname);
-	fprintf(stderr, "       %s <ctdbd-pid> <output-fd> DB <db1-path> <db1-flags> [<db2-path> <db2-flags>...]\n", progname);
+	fprintf(stderr, "       %s <ctdbd-pid> <output-fd> DB <db-path> <db-flags>\n", progname);
 }
 
 static uint8_t *hex_decode_talloc(TALLOC_CTX *mem_ctx,
@@ -190,17 +190,14 @@ int main(int argc, char *argv[])
 		result = lock_record(argv[4], argv[5], argv[6]);
 
 	} else if (strcmp(lock_type, "DB") == 0) {
-		int n;
-
-		/* If there are no databases specified, no need for lock */
-		if (argc > 4) {
-			for (n=4; n+1<argc; n+=2) {
-				result = lock_db(argv[n], argv[n+1]);
-				if (result != 0) {
-					break;
-				}
-			}
+		if (argc != 6) {
+			fprintf(stderr,
+				"locking: Invalid number of arguments (%d)\n",
+				argc);
+			usage();
+			exit(1);
 		}
+		result = lock_db(argv[4], argv[5]);
 
 	} else {
 		fprintf(stderr, "locking: Invalid lock-type '%s'\n", lock_type);