sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

ctdb-scripts: No longer set the NAT gateway capability

Browse Source 
Nothing checks it anymore.

This means that the NAT gateway capability in the daemon is now
unused.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2016-01-05 15:53:50 +11:00 committed by Amitay Isaacs
parent 411ccb98c3
commit 3b64c27ca6
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ctdb/config/events.d/11.natgw
View File

@ -98,16 +98,6 @@ natgw_config_has_changed ()
return 0
}
natgw_set_capability ()
{
# Set NATGW capability depending on configuration
if ctdb_natgw_slave_only ; then
ctdb setnatgwstate off
else
ctdb setnatgwstate on
fi
}
_natgw_clear ()
{
_ip="${CTDB_NATGW_PUBLIC_IP%/*}"
@ -210,10 +200,9 @@ natgw_save_state ()
}
case "$1" in
case "$1" in
setup)
natgw_check_config
natgw_set_capability
;;
startup)
@ -235,7 +224,6 @@ case "$1" in
ctdb_get_pnn
natgw_set_capability
natgw_ensure_master
natgw_config_has_changed || natgw_master_has_changed || exit 0

2
ctdb/tests/eventscripts/11.natgw.053.sh
View File

@ -12,7 +12,5 @@ setup_ctdb_natgw <<EOF
192.168.1.24
EOF
ctdb setnatgwstate on
ok_null
simple_test_event "monitor"

2
ctdb/tests/eventscripts/11.natgw.054.sh
View File

@ -12,8 +12,6 @@ setup_ctdb_natgw <<EOF
192.168.1.24
EOF
ctdb setnatgwstate on
ethtool_interfaces_down "$CTDB_NATGW_PUBLIC_IFACE"
required_result 1 <<EOF