From: Martin Schwenke <martin@meltin.net>
Date: Fri, 13 May 2016 10:24:52 +0000 (+1000)
Subject: ctdb-scripts: Rename get_iface_ip_maskbits_family() to get_iface_ip_maskbits()
X-Git-Tag: tdb-1.3.10~1060
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d78bf2ed3ed8022727824b21c41d44c2d30e574d;p=thirdparty%2Fsamba.git

ctdb-scripts: Rename get_iface_ip_maskbits_family() to get_iface_ip_maskbits()

The family is not needed.

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

diff --git a/ctdb/config/events.d/10.interface b/ctdb/config/events.d/10.interface
index fc9097b84e6..bdb94430a06 100755
--- a/ctdb/config/events.d/10.interface
+++ b/ctdb/config/events.d/10.interface
@@ -74,8 +74,8 @@ monitor_interfaces()
 	return 0
 }
 
-# Sets: iface, ip, maskbits, family
-get_iface_ip_maskbits_family ()
+# Sets: iface, ip, maskbits
+get_iface_ip_maskbits ()
 {
     _iface_in="$1"
     ip="$2"
@@ -85,7 +85,6 @@ get_iface_ip_maskbits_family ()
     if [ -n "$1" ] ; then
 	maskbits="$1"
 	iface="$2"
-	family="$3"
 
 	if [ "$iface" != "$_iface_in" ] ; then
 	    printf \
@@ -183,7 +182,7 @@ case "$1" in
 	# 3) remove the IP from the interface
 	# 4) remove the firewall rule
 	shift
-	get_iface_ip_maskbits_family "$@"
+	get_iface_ip_maskbits "$@"
 
 	ip_block "$ip" "$iface"
 
@@ -216,7 +215,7 @@ case "$1" in
 	_ip=$4
 	_maskbits=$5
 
-	get_iface_ip_maskbits_family "$_oiface" "$_ip" "$_maskbits"
+	get_iface_ip_maskbits "$_oiface" "$_ip" "$_maskbits"
 	oiface="$iface"
 
 	ip_block "$ip" "$oiface"