sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-05 09:18:06 +03:00
Code

ctdb-scripts: Reformat with "shfmt -w -p -i 0 -fn"

Browse Source 
Massage a couple of lines manually so they're formatted sanely given
the new indentation.   Re-run shfmt to ensure no further changes.

Best reviewed with "git show -w".

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jerry Heyman <jheyman@ddn.com>
This commit is contained in:
Martin Schwenke 2024-09-13 16:21:24 +10:00 committed by Martin Schwenke
parent 025bd34dfc
commit 3410eddd93
1 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ctdb/config/events/legacy/10.interface.script
View File

@ -3,7 +3,7 @@
# Handle public IP address release and takeover, as well as monitoring # Handle public IP address release and takeover, as well as monitoring
# interfaces used by public IP addresses. # interfaces used by public IP addresses.
[ -n "$CTDB_BASE" ] || \ [ -n "$CTDB_BASE" ] ||
CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD") CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
. "${CTDB_BASE}/functions" . "${CTDB_BASE}/functions"
@ -11,7 +11,7 @@
load_script_options load_script_options
if ! have_public_addresses; then if ! have_public_addresses; then
if [ "$1" = "init" ] ; then if [ "$1" = "init" ]; then
echo "No public addresses file found" echo "No public addresses file found"
fi fi
exit 0 exit 0
@ -30,8 +30,8 @@ monitor_interfaces()
# #
# public_ifaces set by get_public_ifaces() above # public_ifaces set by get_public_ifaces() above
# shellcheck disable=SC2154 # shellcheck disable=SC2154
for _iface in $public_ifaces ; do for _iface in $public_ifaces; do
if interface_monitor "$_iface" ; then if interface_monitor "$_iface"; then
up_interfaces_found=true up_interfaces_found=true
$CTDB setifacelink "$_iface" up >/dev/null 2>&1 $CTDB setifacelink "$_iface" up >/dev/null 2>&1
else else
@ -40,11 +40,11 @@ monitor_interfaces()
fi fi
done done
if ! $down_interfaces_found ; then if ! $down_interfaces_found; then
return 0 return 0
fi fi
if ! $up_interfaces_found ; then if ! $up_interfaces_found; then
return 1 return 1
fi fi
@ -56,7 +56,7 @@ monitor_interfaces()
} }
# Sets: iface, ip, maskbits # Sets: iface, ip, maskbits
get_iface_ip_maskbits () get_iface_ip_maskbits()
{ {
_iface_in="$1" _iface_in="$1"
ip="$2" ip="$2"
@ -65,18 +65,16 @@ get_iface_ip_maskbits ()
# Intentional word splitting here # Intentional word splitting here
# shellcheck disable=SC2046 # shellcheck disable=SC2046
set -- $(ip_maskbits_iface "$ip") set -- $(ip_maskbits_iface "$ip")
if [ -n "$1" ] ; then if [ -n "$1" ]; then
maskbits="$1" maskbits="$1"
iface="$2" iface="$2"
if [ "$iface" != "$_iface_in" ] ; then if [ "$iface" != "$_iface_in" ]; then
printf \ printf 'WARNING: Public IP %s hosted on interface %s but VNN says %s\n' \
'WARNING: Public IP %s hosted on interface %s but VNN says %s\n' \
"$ip" "$iface" "$_iface_in" "$ip" "$iface" "$_iface_in"
fi fi
if [ "$maskbits" != "$_maskbits_in" ] ; then if [ "$maskbits" != "$_maskbits_in" ]; then
printf \ printf 'WARNING: Public IP %s has %s bit netmask but VNN says %s\n' \
'WARNING: Public IP %s has %s bit netmask but VNN says %s\n' \
"$ip" "$maskbits" "$_maskbits_in" "$ip" "$maskbits" "$_maskbits_in"
fi fi
else else
@ -84,7 +82,7 @@ get_iface_ip_maskbits ()
fi fi
} }
ip_block () ip_block()
{ {
_ip="$1" _ip="$1"
_iface="$2" _iface="$2"
@ -101,7 +99,7 @@ ip_block ()
-I INPUT -i "$_iface" -d "$_ip" -j DROP -I INPUT -i "$_iface" -d "$_ip" -j DROP
} }
ip_unblock () ip_unblock()
{ {
_ip="$1" _ip="$1"
_iface="$2" _iface="$2"
@ -120,7 +118,7 @@ ctdb_check_args "$@"
case "$1" in case "$1" in
init) init)
_promote="sys/net/ipv4/conf/all/promote_secondaries" _promote="sys/net/ipv4/conf/all/promote_secondaries"
get_proc "$_promote" >/dev/null 2>&1 || \ get_proc "$_promote" >/dev/null 2>&1 ||
die "Public IPs only supported if promote_secondaries is available" die "Public IPs only supported if promote_secondaries is available"
# Make sure we drop any IPs that might still be held if # Make sure we drop any IPs that might still be held if
@ -144,7 +142,7 @@ takeip)
update_my_public_ip_addresses "takeip" "$ip" update_my_public_ip_addresses "takeip" "$ip"
add_ip_to_iface "$iface" "$ip" "$maskbits" || { add_ip_to_iface "$iface" "$ip" "$maskbits" || {
exit 1; exit 1
} }
# In case a previous "releaseip" for this IP was killed... # In case a previous "releaseip" for this IP was killed...
@ -211,7 +209,7 @@ updateip)
# Could check maskbits too. However, that should never change # Could check maskbits too. However, that should never change
# so we want to notice if it does. # so we want to notice if it does.
if [ "$oiface" = "$niface" ] ; then if [ "$oiface" = "$niface" ]; then
echo "Redundant \"updateip\" - ${ip} already on ${niface}" echo "Redundant \"updateip\" - ${ip} already on ${niface}"
exit 0 exit 0
fi fi