]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
ctdb-scripts: Rename get_iface_ip_maskbits_family() to get_iface_ip_maskbits()
authorMartin Schwenke <martin@meltin.net>
Fri, 13 May 2016 10:24:52 +0000 (20:24 +1000)
committerMartin Schwenke <martins@samba.org>
Thu, 26 May 2016 06:04:29 +0000 (08:04 +0200)
The family is not needed.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/config/events.d/10.interface

index fc9097b84e613728830a6440d4b9653917f347d9..bdb94430a06fda09d7108603626446ee9d433911 100755 (executable)
@@ -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"