# Remove CARNet configuration from /etc/hosts.allow and
# /etc/hosts.deny.
#
- if [ -f "/etc/hosts.allow" ]; then
+ if [ -f /etc/hosts.allow ]; then
cp-update -r "$PKG" /etc/hosts.allow
fi
- if [ -f "/etc/hosts.deny" ]; then
+ if [ -f /etc/hosts.deny ]; then
cp-update -r "$PKG" /etc/hosts.deny
fi
# configuration.
#
SQCONF=/etc/squirrelmail/config.php
-
- cp_echo "CN: Disabling SquirrelMail change_pass plugin in $SQCONF"
- cp_check_and_sed '^\$plugins.*change_pass' \
- '/^\$plugins.*change_pass/d' \
- "$SQCONF" || true
+
+ if egrep -q '^\$plugins\[[0-9]+\][\ ]*=[\ ]*'\''change_pass'\' "$SQCONF"; then
+ cp_echo "CN: Disabling SquirrelMail change_pass plugin in $SQCONF"
+ /usr/sbin/squirrelmail-configure --remove-plugin change_pass
+ fi
# Remove poppassd service from xinetd.
#
- if [ -f "/etc/xinetd.d/poppassd" ]; then
+ if [ -f /etc/xinetd.d/poppassd ]; then
if egrep -q "^# Begin update by CARNet package " /etc/xinetd.d/poppassd; then
- cp_echo "CN: Removing poppassd service from xinetd configuration."
+ cp_echo "CN: Removing poppassd service from xinetd configuration"
rm -f /etc/xinetd.d/poppassd
need_restart=1
fi