diff options
| author | Martin Schwenke <martin@meltin.net> | 2016-02-08 15:55:17 +1100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2016-02-16 12:13:06 +0100 |
| commit | 6c6599cf1ce45e0582e01b206c99e0b143bbfdc4 (patch) | |
| tree | 147bc2f1010a60394d571110b7b25cccb089b4c7 | |
| parent | f8618dc2d6014bd710883ff195915c89f1959054 (diff) | |
| download | samba-6c6599cf1ce45e0582e01b206c99e0b143bbfdc4.tar.gz | |
ctdb-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>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Wed Feb 10 14:08:17 CET 2016 on sn-devel-144
(cherry picked from commit 519564bb35a0f840bc4d7c8c5a92441c97b49791)
Autobuild-User(v4-3-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-3-test): Tue Feb 16 12:13:06 CET 2016 on sn-devel-104
| -rwxr-xr-x | ctdb/config/events.d/11.natgw | 4 | ||||
| -rwxr-xr-x | ctdb/config/events.d/49.winbind | 7 |
2 files changed, 0 insertions, 11 deletions
diff --git a/ctdb/config/events.d/11.natgw b/ctdb/config/events.d/11.natgw index 54e6cd92c36..29339f4b822 100755 --- a/ctdb/config/events.d/11.natgw +++ b/ctdb/config/events.d/11.natgw @@ -149,10 +149,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/ctdb/config/events.d/49.winbind b/ctdb/config/events.d/49.winbind index dee3c906c8b..a1ea78703ae 100755 --- a/ctdb/config/events.d/49.winbind +++ b/ctdb/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 "$@" ;; |