diff --git a/plugins/dnsbl b/plugins/dnsbl index 45135a9..7c869ee 100644 --- a/plugins/dnsbl +++ b/plugins/dnsbl @@ -288,7 +288,7 @@ sub hook_rcpt { $self->log(LOGWARN, "skip, don't blacklist special account: ".$rcpt->user); # clear the naughty connection note here, if desired. - #$self->connection->notes('naughty', 0 ); + $self->connection->notes('naughty', 0 ); } return DECLINED; diff --git a/plugins/dspam b/plugins/dspam index a71ee9b..d92da7f 100644 --- a/plugins/dspam +++ b/plugins/dspam @@ -213,6 +213,12 @@ sub register { $self->{_args} = { @_ }; $self->{_args}{reject} = 1 if ! defined $self->{_args}{reject}; $self->{_args}{reject_type} ||= 'perm'; + $self->{_args}{dspam_bin} ||= '/usr/local/bin/dspam'; + + if ( ! -x $self->{_args}{dspam_bin} ) { + $self->log(LOGERROR, "dspam not found: "); + return DECLINED; + }; $self->register_hook('data_post', 'data_post_handler'); } @@ -228,9 +234,9 @@ sub data_post_handler { return (DECLINED); }; - my $username = $self->select_username( $transaction ); - my $dspam_bin = $self->{_args}{dspam_bin} || '/usr/local/bin/dspam'; - my $filtercmd = "$dspam_bin --user $username --mode=tum --process --deliver=summary --stdout"; + my $user = $self->select_username( $transaction ); + my $bin = $self->{_args}{dspam_bin}; + my $filtercmd = "$bin --user $user --mode=tum --process --deliver=summary --stdout"; $self->log(LOGDEBUG, $filtercmd); my $response = $self->dspam_process( $filtercmd, $transaction );