Changeset 2187

Timestamp:

01/23/19 10:01:52 (5 years ago)

Author:

nanardon

Message:

Fix: compute network size only for IPv4

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Netzone.pm (modified) (2 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Netzone.pm

@@ -94 +94 @@
                         (
                         select host(network(value::inet)+ (generate_series(0, broadcast(value::inet) - network(value::inet)))) from
-                        netzone_attributes where attr='netExclude' and okey = $1
+                        netzone_attributes where attr='netExclude' and okey = $1 and family(netzone_attributes.value::inet) = 4
                         union
                         select nethost_attributes_ips.value from nethost_attributes_ips join netzone_attributes on
                         netzone_attributes.attr='net' and nethost_attributes_ips.value::inet <<= netzone_attributes.value::inet
-                        where netzone_attributes.okey = $1
+                        where netzone_attributes.okey = $1 and family(netzone_attributes.value::inet) = 4
                         )
                         ) as s
@@ -129 +129 @@
                         (
                         select host(network(value::inet)+ (generate_series(0, broadcast(value::inet) - network(value::inet)))) from
-                        netzone_attributes where attr='netExclude' and okey = $1
+                        netzone_attributes where attr='netExclude' and okey = $1 and family(netzone_attributes.value::inet) = 4
                         )
                         ) as s