diff options
| author | jim-p <jimp@pfsense.org> | 2011-05-02 11:08:01 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-05-02 11:10:23 -0400 |
| commit | fd27296d65a33e68f89846831ba45178df3a56fb (patch) | |
| tree | aefecc825bb1a46d087437e34c4c46d01b5e1b4f | |
| parent | bb738aba5c70b662d0060e938da412012bae92bf (diff) | |
| download | pfsense-packages-fd27296d65a33e68f89846831ba45178df3a56fb.tar.gz pfsense-packages-fd27296d65a33e68f89846831ba45178df3a56fb.tar.bz2 pfsense-packages-fd27296d65a33e68f89846831ba45178df3a56fb.zip | |
Also allow subnets in the proxy bypass fields.
| -rw-r--r-- | config/squid/squid.inc | 4 | ||||
| -rw-r--r-- | config/squid/squid.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/squid/squid.inc b/config/squid/squid.inc index 61498294..5a17d8c9 100644 --- a/config/squid/squid.inc +++ b/config/squid/squid.inc @@ -362,14 +362,14 @@ function squid_validate_general($post, $input_errors) { foreach (array('defined_ip_proxy_off') as $hosts) { foreach (explode(";", $post[$hosts]) as $host) { $host = trim($host); - if (!empty($host) && !is_ipaddr($host) && !is_alias($host) && !is_hostname($host)) + if (!empty($host) && !is_ipaddr($host) && !is_alias($host) && !is_hostname($host) && !is_subnet($host)) $input_errors[] = "The entry '$host' is not a valid IP address, hostname, or alias"; } } foreach (array('defined_ip_proxy_off_dest') as $hosts) { foreach (explode(";", $post[$hosts]) as $host) { $host = trim($host); - if (!empty($host) && !is_ipaddr($host) && !is_alias($host) && !is_hostname($host)) + if (!empty($host) && !is_ipaddr($host) && !is_alias($host) && !is_hostname($host) && !is_subnet($host)) $input_errors[] = "The entry '$host' is not a valid IP address, hostname, or alias"; } } diff --git a/config/squid/squid.xml b/config/squid/squid.xml index fe648a18..4ce0af0f 100644 --- a/config/squid/squid.xml +++ b/config/squid/squid.xml @@ -177,14 +177,14 @@ <field> <fielddescr>Bypass proxy for these source IPs</fielddescr> <fieldname>defined_ip_proxy_off</fieldname> - <description>Do not forward traffic from these <b>source</b> IPs, hostnames, or aliases through the proxy server but directly through the firewall. Separate by semi-colons (;).</description> + <description>Do not forward traffic from these <b>source</b> IPs, CIDR nets, hostnames, or aliases through the proxy server but directly through the firewall. Separate by semi-colons (;).</description> <type>input</type> <size>80</size> </field> <field> <fielddescr>Bypass proxy for these destination IPs</fielddescr> <fieldname>defined_ip_proxy_off_dest</fieldname> - <description>Do not proxy traffic going to these <b>destination</b> IPs, hostnames, or aliases, but let it pass directly through the firewall. Separate by semi-colons (;).</description> + <description>Do not proxy traffic going to these <b>destination</b> IPs, CIDR nets, hostnames, or aliases, but let it pass directly through the firewall. Separate by semi-colons (;).</description> <type>input</type> <size>80</size> </field> |