From: Martin Schwenke Date: Mon, 23 Oct 2023 03:23:45 +0000 (+1100) Subject: ctdb-scripts: Remove superseded compatibility code X-Git-Tag: samba-4.20.7~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76ddab97e7693e11b5b6952524bd9d5bb9e3f8b3;p=thirdparty%2Fsamba.git ctdb-scripts: Remove superseded compatibility code Since commit 224e99804efef960ef4ce2ff2f4f6dced1e74146, square brackets have been parsed by daemon and tool code, so drop the compatibility code from here. 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 Reviewed-by: Volker Lendecke Reviewed-by: Jerry Heyman (cherry picked from commit 32e4f786601712e57992ce4c8f46e5d38620a5dd) --- diff --git a/ctdb/config/functions b/ctdb/config/functions index 45092cda26e..34382c465e0 100755 --- a/ctdb/config/functions +++ b/ctdb/config/functions @@ -1173,16 +1173,10 @@ update_tickles() _my_connections="${tickledir}/${_port}.connections.$$" # Parentheses are needed around the filters for precedence but # the parentheses can't be empty! - # - # Recent versions of ss print square brackets around IPv6 - # addresses. While it is desirable to update CTDB's address - # parsing and printing code, something needs to be done here - # for backward compatibility, so just delete the brackets. ss -tn state established \ "${_ip_filter:+( ${_ip_filter} )}" \ "${_port_filter:+( ${_port_filter} )}" | awk 'NR > 1 {print $4, $3}' | - tr -d '][' | sort >"$_my_connections" # Record our current tickles in a temporary file