From: Martin Schwenke <mschwenke@ddn.com>
Date: Mon, 23 Oct 2023 03:05:21 +0000 (+1100)
Subject: ctdb-scripts: Move connection tracking to 10.interface
X-Git-Tag: samba-4.20.7~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20987bf505855944f2c4cbcfe726c0ab68aea221;p=thirdparty%2Fsamba.git

ctdb-scripts: Move connection tracking to 10.interface

This should really be done for all connections to public IP addresses.
Leave the port number there for now - this is just the first step.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15320
RN: Update CTDB to track all TCP connections to public IP addresses

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jerry Heyman <jheyman@ddn.com>
(cherry picked from commit 9683bb3ac2bbdf0e83c3be3681f9d1c8ee7cc327)
---

diff --git a/ctdb/config/events/legacy/10.interface.script b/ctdb/config/events/legacy/10.interface.script
index 96b89af7196..d7d830bf133 100755
--- a/ctdb/config/events/legacy/10.interface.script
+++ b/ctdb/config/events/legacy/10.interface.script
@@ -265,6 +265,8 @@ ipreallocated)
 
 monitor)
 	monitor_interfaces || exit 1
+
+	update_tickles 2049
 	;;
 esac
 
diff --git a/ctdb/config/events/legacy/60.nfs.script b/ctdb/config/events/legacy/60.nfs.script
index b7ae0746be5..d7d30229172 100755
--- a/ctdb/config/events/legacy/60.nfs.script
+++ b/ctdb/config/events/legacy/60.nfs.script
@@ -289,7 +289,6 @@ monitor)
 		exit $?
 	fi
 
-	update_tickles 2049
 	nfs_update_lock_info
 
 	nfs_check_services