-# check for SAVI:
-# if not there, comment it out, if there, uncomment and restart
-if ! dpkg -l libsavi-perl 2> /dev/null | egrep -q '^.i' || ! [ -f /usr/lib/libsavi.so ]; then
- if cp_check_and_sed "^\['Sophos SAVI'" \
- "s/^\(\['Sophos SAVI', ..sophos_savi \]\)/#\1/" $ACONF; then
- cp_echo "CN: Disabled SAVI::Perl usage in ${ACONF}."
- cp_echo " To enable it, run sophos-sweep-update, uncomment and restart amavis."
- fi
-else
- if cp_check_and_sed "^#\['Sophos SAVI'" \
- "s/^#\(\['Sophos SAVI', ..sophos_savi \]\)/\1/" $ACONF; then
- cp_echo "CN: Enabled SAVI::Perl usage in ${ACONF}."
- restart_daemon=1
- fi
+# disable SAVI as proven problematic
+if cp_check_and_sed "^[[:blank:]]*\['Sophos SAVI'" \
+ "s/^[[:blank:]]*\(\['Sophos SAVI', ..sophos_savi \]\)/#\1/" $ACONF; then
+ cp_echo "CN: Disabled SAVI::Perl usage in ${ACONF}."
+ restart_daemon=1