From: Martin Schwenke <martin@meltin.net>
Date: Mon, 11 Jun 2018 19:54:07 +0000 (+1000)
Subject: ctdb-tests: Clean up argument validation in 00.test event script
X-Git-Tag: tevent-0.9.37~172
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=acd10a5d47bd3aae18bbe60c44481c7d2e264813;p=thirdparty%2Fsamba.git

ctdb-tests: Clean up argument validation in 00.test event script

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

diff --git a/ctdb/tests/simple/etc-ctdb/events/legacy/00.test.script b/ctdb/tests/simple/etc-ctdb/events/legacy/00.test.script
index 71b2e05a6af..28141b2b747 100755
--- a/ctdb/tests/simple/etc-ctdb/events/legacy/00.test.script
+++ b/ctdb/tests/simple/etc-ctdb/events/legacy/00.test.script
@@ -1,10 +1,14 @@
 #!/bin/sh
 # event script for 'make test'
 
-cmd="$1"
+. "${CTDB_BASE}/functions"
+
+ctdb_check_args "$@"
+
+event="$1"
 shift
 
-case $cmd in 
+case "$event" in
     monitor)
 	echo "monitor event"
 	echo "monitor event stderr" >&2
@@ -35,10 +39,6 @@ case $cmd in
 	;;
 	
      takeip)
-	if [ $# != 3 ]; then
-	   echo "must supply interface, IP and maskbits"
-	   exit 1
-	fi
 	iface=$1
 	ip=$2
 	maskbits=$3
@@ -57,10 +57,6 @@ case $cmd in
      ##################################################
      # called when ctdbd wants to release an IP address
      releaseip)
-	if [ $# != 3 ]; then
-	   echo "must supply interface, IP and maskbits"
-	   exit 1
-	fi
 	iface=$1
 	ip=$2
 	maskbits=$3