diff options
| author | Renato Botelho <renato@netgate.com> | 2015-09-24 07:02:54 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-09-24 07:02:54 -0300 |
| commit | 45432e46ab166d2b27f9bef4927cbe2f04b91e63 (patch) | |
| tree | 87901b675ecbee337cdc38e3a68cd5b7825e8d38 | |
| parent | 2fafdcbadfae5173a3c4dcd45b24955534d087b4 (diff) | |
| parent | a95f4b2f7435fcca00ab3d10e3c9276ca2af4d44 (diff) | |
| download | pfsense-packages-45432e46ab166d2b27f9bef4927cbe2f04b91e63.tar.gz pfsense-packages-45432e46ab166d2b27f9bef4927cbe2f04b91e63.tar.bz2 pfsense-packages-45432e46ab166d2b27f9bef4927cbe2f04b91e63.zip | |
Merge pull request #1079 from doktornotor/patch-1
| -rwxr-xr-x | config/squid3/33/squid.inc | 1 | ||||
| -rwxr-xr-x | config/squid3/33/squid_antivirus.xml | 2 | ||||
| -rwxr-xr-x | config/squid3/34/squid.inc | 1 | ||||
| -rwxr-xr-x | config/squid3/34/squid_antivirus.xml | 2 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
7 files changed, 7 insertions, 5 deletions
diff --git a/config/squid3/33/squid.inc b/config/squid3/33/squid.inc index 73be7162..0f71def8 100755 --- a/config/squid3/33/squid.inc +++ b/config/squid3/33/squid.inc @@ -1308,6 +1308,7 @@ function squid_resync_antivirus(){ if ($antivirus_config['enable']=="on"){ switch ($antivirus_config['client_info']){ case "both": + default: $icap_send_client_ip="on"; $icap_send_client_username="on"; break; diff --git a/config/squid3/33/squid_antivirus.xml b/config/squid3/33/squid_antivirus.xml index 67319297..59f33fe2 100755 --- a/config/squid3/33/squid_antivirus.xml +++ b/config/squid3/33/squid_antivirus.xml @@ -110,7 +110,7 @@ <fieldname>client_info</fieldname> <description><![CDATA[Select what client info to forward to clamav.]]></description> <type>select</type> - <default_value>strip</default_value> + <default_value>both</default_value> <options> <option><name>Send Both client username and ip info(Default)</name><value>both</value></option> <option><name>Send only client username</name><value>username</value></option> diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc index ec30910f..665c0d7c 100755 --- a/config/squid3/34/squid.inc +++ b/config/squid3/34/squid.inc @@ -1323,6 +1323,7 @@ function squid_resync_antivirus() { if ($antivirus_config['enable']=="on") { switch ($antivirus_config['client_info']) { case "both": + default: $icap_send_client_ip="on"; $icap_send_client_username="on"; break; diff --git a/config/squid3/34/squid_antivirus.xml b/config/squid3/34/squid_antivirus.xml index c722598d..5c1b57d5 100755 --- a/config/squid3/34/squid_antivirus.xml +++ b/config/squid3/34/squid_antivirus.xml @@ -110,7 +110,7 @@ <fieldname>client_info</fieldname> <description><![CDATA[Select what client info to forward to clamav.]]></description> <type>select</type> - <default_value>strip</default_value> + <default_value>both</default_value> <options> <option><name>Send Both client username and ip info(Default)</name><value>both</value></option> <option><name>Send only client username</name><value>username</value></option> diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 6abd59c0..728cf50c 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1052,7 +1052,7 @@ <pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>0.3.3</version> + <version>0.3.4</version> <status>beta</status> <required_version>2.2</required_version> <maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index b1f27212..484b6b6b 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1167,7 +1167,7 @@ <pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>3.3.10 pkg 2.2.9</version> + <version>3.3.10 pkg 2.3.0</version> <status>beta</status> <required_version>2.0</required_version> <maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 3dd1702c..829bd0cf 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1154,7 +1154,7 @@ <pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>3.3.10 pkg 2.2.9</version> + <version>3.3.10 pkg 2.3.0</version> <status>beta</status> <required_version>2.0</required_version> <maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer> |