Index: openacs-4/packages/acs-tcl/tcl/00-icanuse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/00-icanuse-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-tcl/tcl/00-icanuse-procs.tcl	24 Oct 2024 16:53:24 -0000	1.5
+++ openacs-4/packages/acs-tcl/tcl/00-icanuse-procs.tcl	26 Nov 2024 08:18:55 -0000	1.6
@@ -139,7 +139,6 @@
 ::acs::register_icanuse "ns_set values"             [acs::cmd_has_subcommand ns_set values]
 ::acs::register_icanuse "ns_setcookie -samesite"    [acs::cmd_error_contains ns_setcookie -samesite]
 ::acs::register_icanuse "ns_strcoll"                {[info commands ::ns_strcoll] ne ""}
-::acs::register_icanuse "ns_subnetmatch"            {[info commands ::ns_subnetmatch] ne ""}
 ::acs::register_icanuse "ns_urlencode -part oauth1" [acs::cmd_error_contains {ns_urlencode -part xxx} oauth1]
 ::acs::register_icanuse "ns_writer"                 {[info commands ::ns_writer] ne ""}
 ::acs::register_icanuse "nsf::config profile"       [expr {[info exists ::nsf::config(profile)] ? $::nsf::config(profile) : 0}]
Index: openacs-4/packages/acs-tcl/tcl/cluster-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/cluster-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-tcl/tcl/cluster-procs.tcl	27 Oct 2024 16:50:22 -0000	1.4
+++ openacs-4/packages/acs-tcl/tcl/cluster-procs.tcl	26 Nov 2024 08:18:55 -0000	1.5
@@ -274,7 +274,7 @@
                                 # in CIDR notation or it contains a
                                 # wild card.
                                 #
-                                if {([string first / $ip] != -1 && [ns_subnetmatch $ip $peer])
+                                if {([string first / $ip] != -1 && [ns_ip match $ip $peer])
                                     || ([string first * $ip] != -1 && [string match $ip $peer])
                                 } {
                                     set ok 1
Index: openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl,v
diff -u -r1.33 -r1.34
--- openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl	25 Nov 2024 13:18:27 -0000	1.33
+++ openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl	26 Nov 2024 08:18:55 -0000	1.34
@@ -2618,7 +2618,7 @@
         flush $wfd
         close $wfd
 
-        set rpset [ns_set new [_ns_http_gets $timeout $rfd]]
+        set rpset [ns_set create [_ns_http_gets $timeout $rfd]]
         while 1 {
             set line [_ns_http_gets $timeout $rfd]
             if { $line eq "" } break
@@ -2928,7 +2928,7 @@
         flush $wfd
         close $wfd
 
-        set rpset [ns_set new [_ns_http_gets $timeout $rfd]]
+        set rpset [ns_set create [_ns_http_gets $timeout $rfd]]
         while 1 {
             set line [_ns_http_gets $timeout $rfd]
             if { $line eq "" } break
Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -r1.128 -r1.129
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	11 Sep 2024 06:15:48 -0000	1.128
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	26 Nov 2024 08:18:55 -0000	1.129
@@ -3067,27 +3067,6 @@
         # returned.
         #
         set validationOk [expr {![ns_ip public [ns_addrbyhost $host]]}]
-
-    } elseif {[acs::icanuse "ns_subnetmatch"]} {
-        #
-        # Test for older versions of NaviServer testing if value is an
-        # IP address belonging to a "private network".
-        #
-        try {
-            ns_subnetmatch 0.0.0.0/0 $host
-        } on error {errorMsg} {
-            set ip_address_p 0
-        } on ok {ip_address_p} {
-        }
-        if {$ip_address_p} {
-            if {[ns_subnetmatch 10.0.0.0/8 $host]
-                || [ns_subnetmatch 172.16.0.0/12 $host]
-                || [ns_subnetmatch 192.168.0.0/16 $host]
-                || [ns_subnetmatch fd00::/8 $host]
-            } {
-                return 1
-            }
-        }
     }
 
     return 0