From 2e7acc10be35571db5accaf346ab49eafde407ad Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Sat, 27 Apr 2024 19:10:27 +0200 Subject: [PATCH] www/squid - remove format() call in helpers.getIPNetwork() for ipaddress compatibility. for https://github.com/opnsense/core/issues/7415 --- .../src/opnsense/service/templates/OPNsense/Proxy/squid.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/squid/src/opnsense/service/templates/OPNsense/Proxy/squid.conf b/www/squid/src/opnsense/service/templates/OPNsense/Proxy/squid.conf index 4b334cd3f..6c7369393 100644 --- a/www/squid/src/opnsense/service/templates/OPNsense/Proxy/squid.conf +++ b/www/squid/src/opnsense/service/templates/OPNsense/Proxy/squid.conf @@ -122,10 +122,10 @@ ftp_port {{intf_item.subnet}}:{{ OPNsense.proxy.forward.ftpPort }} accel ftp-tra {% for interface in OPNsense.proxy.forward.interfaces.split(",") %} {% for intf_key,intf_item in interfaces.items() %} {% if intf_key == interface and intf_item.ipaddr and intf_item.ipaddr != 'dhcp' %} -acl localnet src {{ helpers.getIPNetwork(intf_item.ipaddr+'/'+intf_item.subnet)[0].format() }}/{{intf_item.subnet}} # Possible internal network (interfaces v4) +acl localnet src {{helpers.getIPNetwork(intf_item.ipaddr+'/'+intf_item.subnet)[0].__str__() }}/{{intf_item.subnet}} # Possible internal network (interfaces v4) {% endif %} {% if intf_key == interface and intf_item.ipaddrv6 and intf_item.ipaddrv6.find(':') > -1 %} -acl localnet src {{helpers.getIPNetwork(intf_item.ipaddrv6+'/'+intf_item.subnetv6)[0].format()}}/{{intf_item.subnetv6}} # Possible internal network (interfaces v6) +acl localnet src {{helpers.getIPNetwork(intf_item.ipaddrv6+'/'+intf_item.subnetv6)[0].__str__()}}/{{intf_item.subnetv6}} # Possible internal network (interfaces v6) {% endif %} {% endfor %} {% if helpers.exists('virtualip.vip') %}