scripts: Drop use of "smbcontrol winbindd ip-dropped ..."

This is unnecessary in Samba >= 4.0 because winbindd monitors IP
address itself and no longer needs to be told when they are dropped.
The smbcontrol commands can hang if a node has recovery mode active
because smbcontrol is unable to connect to the registry.  Therefore,
the smbcontrol commands should be removed.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11719

Signed-off-by: Martin Schwenke <martin@meltin.net>
(Imported from commit 519564bb35a0f840bc4d7c8c5a92441c97b49791)

diff --git a/config/events.d/11.natgw b/config/events.d/11.natgw
index aef302c59e9655b52735525b8bf888e34bc0d3e0..5e10d1d0c10f0e8641e0dcc2f47c8a04926e0723 100755 (executable)
--- a/config/events.d/11.natgw
+++ b/config/events.d/11.natgw
@@ -98,10 +98,6 @@ natgw_set_slave ()
        _net="${_net_gw%@*}"
        ip route add "$_net" via "$_natgwip" metric 10
     done
-
-    # Make sure winbindd does not stay bound to this address if we are
-    # no longer NATGW master
-    smbcontrol winbindd ip-dropped $CTDB_NATGW_PUBLIC_IP >/dev/null 2>&1
 }
 
 natgw_ensure_master ()

diff --git a/config/events.d/49.winbind b/config/events.d/49.winbind
index dee3c906c8b65844c5c78ff28208c69c6afeb775..a1ea78703ae8f221a42c4efcde42bd109257cee6 100755 (executable)
--- a/config/events.d/49.winbind
+++ b/config/events.d/49.winbind
@@ -55,13 +55,6 @@ case "$1" in
        ctdb_check_command wbinfo -p
        ;;
 
-     takeip|releaseip)
-       iface=$2
-       ip=$3
-       maskbits=$4
-
-       smbcontrol winbindd ip-dropped $ip >/dev/null 2>/dev/null
-       ;;
     *)
        ctdb_standard_event_handler "$@"
        ;;