From: Martin Schwenke <martin@meltin.net>
Date: Fri, 13 May 2016 15:01:48 +0000 (+1000)
Subject: ctdb-tests: Drop no-op functions and add an ip6tables stub
X-Git-Tag: tdb-1.3.10~1059
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a412f21d4bd0434c1f6af2f9277d02c180f381b3;p=thirdparty%2Fsamba.git

ctdb-tests: Drop no-op functions and add an ip6tables stub

Stub scripts are more obvious.  rc.local should only be used when
strictly necessary.

iptables_wrapper doesn't need to be no-op-ed, provided flock is
installed.

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

diff --git a/ctdb/tests/eventscripts/etc-ctdb/rc.local b/ctdb/tests/eventscripts/etc-ctdb/rc.local
index 0932ab4ad03..3a55e5327b8 100755
--- a/ctdb/tests/eventscripts/etc-ctdb/rc.local
+++ b/ctdb/tests/eventscripts/etc-ctdb/rc.local
@@ -52,11 +52,6 @@ get_proc ()
     esac
 }
 
-# Always succeed
-iptables () { : ; }
-ip6tables () { : ; }
-iptables_wrapper () { : ; }
-
 # Do not actually background - we want to see the output
 background_with_logging ()
 {
diff --git a/ctdb/tests/eventscripts/stubs/ip6tables b/ctdb/tests/eventscripts/stubs/ip6tables
new file mode 100755
index 00000000000..2c65f7ba112
--- /dev/null
+++ b/ctdb/tests/eventscripts/stubs/ip6tables
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Always succeed.
+
+exit 0