]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
ctdb-scripts: Remove superseded compatibility code
authorMartin Schwenke <mschwenke@ddn.com>
Mon, 23 Oct 2023 03:23:45 +0000 (14:23 +1100)
committerJule Anger <janger@samba.org>
Mon, 25 Nov 2024 12:38:16 +0000 (12:38 +0000)
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 <mschwenke@ddn.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jerry Heyman <jheyman@ddn.com>
(cherry picked from commit 32e4f786601712e57992ce4c8f46e5d38620a5dd)

ctdb/config/functions

index 5d816d50782d2dd65fccbb1b7598343cffb7351c..a5191eac869ab69d81f3a539a556ff6e621e0bfe 100755 (executable)
@@ -1200,16 +1200,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