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 /config | |
| 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
Diffstat (limited to 'config')
| -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 |
4 files changed, 4 insertions, 2 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> |