Merge pull request #190 from msimerson/use-lib
remove instances of: use lib 'lib' in lib/ and
This commit is contained in:
commit
376498f2e8
@ -4,7 +4,6 @@ use warnings;
|
||||
|
||||
use Sys::Hostname;
|
||||
|
||||
use lib 'lib';
|
||||
use parent 'Qpsmtpd::Base';
|
||||
use Qpsmtpd::Constants;
|
||||
|
||||
|
@ -2,7 +2,6 @@ package Qpsmtpd::Plugin;
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
use lib 'lib';
|
||||
use parent 'Qpsmtpd::Base';
|
||||
use Qpsmtpd::DB;
|
||||
use Qpsmtpd::Constants;
|
||||
|
@ -1,7 +1,6 @@
|
||||
package Qpsmtpd::SMTP;
|
||||
use strict;
|
||||
|
||||
#use lib 'lib';
|
||||
use parent 'Qpsmtpd';
|
||||
|
||||
#use Data::Dumper;
|
||||
|
@ -72,7 +72,6 @@ https://github.com/smtpd/qpsmtpd/wiki/DMARC-FAQ
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
use Data::Dumper;
|
||||
use Qpsmtpd::Constants;
|
||||
|
||||
sub register {
|
||||
@ -85,7 +84,7 @@ sub register {
|
||||
$self->{_args}{reject_type} ||= 'perm';
|
||||
$self->{_args}{p_vals} = {map { $_ => 1 } qw/ none reject quarantine /};
|
||||
|
||||
eval "require Mail::DMARC::PurePerl";
|
||||
eval 'require Mail::DMARC::PurePerl';
|
||||
if ( $@ ) {
|
||||
$self->log(LOGERROR, "failed to load Mail::DMARC::PurePerl" );
|
||||
}
|
||||
@ -120,7 +119,9 @@ sub data_post_handler {
|
||||
eval { $dmarc->envelope_from( $transaction->sender->host ); }; # may be <>
|
||||
$dmarc->spf( $transaction->notes('dmarc_spf') );
|
||||
my $dkim = $self->connection->notes('dkim_verifier');
|
||||
if ( $dkim ) { $dmarc->dkim( $dkim ); };
|
||||
if ( $dkim ) {
|
||||
eval { $dmarc->dkim( $dkim ); }
|
||||
};
|
||||
$dmarc->source_ip( $self->qp->connection->remote_ip );
|
||||
eval { $dmarc->validate(); };
|
||||
if ( $@ ) {
|
||||
|
@ -200,8 +200,6 @@ ie, (Trust smtpd).
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
use lib 'lib';
|
||||
|
||||
use Qpsmtpd::Constants;
|
||||
use Qpsmtpd::DSN;
|
||||
use IO::Handle;
|
||||
|
@ -123,7 +123,6 @@ http://smartech.gatech.edu/bitstream/handle/1853/25135/GT-CSE-08-02.pdf
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
use lib 'lib';
|
||||
use Qpsmtpd::Constants;
|
||||
|
||||
#use GeoIP2; # eval'ed in register()
|
||||
|
@ -70,7 +70,6 @@ Default: temp (temporary, aka soft, aka 4xx).
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
use lib 'lib';
|
||||
use Qpsmtpd::Constants;
|
||||
use Qpsmtpd::DSN;
|
||||
use Qpsmtpd::TcpServer;
|
||||
|
@ -92,7 +92,6 @@ may be used and redistributed under the same terms as qpsmtpd itself.
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
use lib 'lib';
|
||||
use Qpsmtpd::Constants;
|
||||
|
||||
use Time::HiRes qw(time);
|
||||
|
Loading…
Reference in New Issue
Block a user