byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #190 from msimerson/use-lib

Browse Source 
remove instances of: use lib 'lib' in lib/ and
This commit is contained in:
Matt Simerson 2015-01-21 10:06:07 -08:00
commit 376498f2e8
8 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Qpsmtpd/Config.pm
View File

@ -4,7 +4,6 @@ use warnings;
use Sys::Hostname; use Sys::Hostname;
use lib 'lib';
use parent 'Qpsmtpd::Base'; use parent 'Qpsmtpd::Base';
use Qpsmtpd::Constants; use Qpsmtpd::Constants;

1
lib/Qpsmtpd/Plugin.pm
View File

@ -2,7 +2,6 @@ package Qpsmtpd::Plugin;
use strict; use strict;
use warnings; use warnings;
use lib 'lib';
use parent 'Qpsmtpd::Base'; use parent 'Qpsmtpd::Base';
use Qpsmtpd::DB; use Qpsmtpd::DB;
use Qpsmtpd::Constants; use Qpsmtpd::Constants;

1
lib/Qpsmtpd/SMTP.pm
View File

@ -1,7 +1,6 @@
package Qpsmtpd::SMTP; package Qpsmtpd::SMTP;
use strict; use strict;
#use lib 'lib';
use parent 'Qpsmtpd'; use parent 'Qpsmtpd';
#use Data::Dumper; #use Data::Dumper;

7
plugins/dmarc
View File

@ -72,7 +72,6 @@ https://github.com/smtpd/qpsmtpd/wiki/DMARC-FAQ
use strict; use strict;
use warnings; use warnings;
use Data::Dumper;
use Qpsmtpd::Constants; use Qpsmtpd::Constants;
sub register { sub register {
@ -85,7 +84,7 @@ sub register {
$self->{_args}{reject_type} ||= 'perm'; $self->{_args}{reject_type} ||= 'perm';
$self->{_args}{p_vals} = {map { $_ => 1 } qw/ none reject quarantine /}; $self->{_args}{p_vals} = {map { $_ => 1 } qw/ none reject quarantine /};
eval "require Mail::DMARC::PurePerl"; eval 'require Mail::DMARC::PurePerl';
if ( $@ ) { if ( $@ ) {
$self->log(LOGERROR, "failed to load Mail::DMARC::PurePerl" ); $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 <> eval { $dmarc->envelope_from( $transaction->sender->host ); }; # may be <>
$dmarc->spf( $transaction->notes('dmarc_spf') ); $dmarc->spf( $transaction->notes('dmarc_spf') );
my $dkim = $self->connection->notes('dkim_verifier'); 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 ); $dmarc->source_ip( $self->qp->connection->remote_ip );
eval { $dmarc->validate(); }; eval { $dmarc->validate(); };
if ( $@ ) { if ( $@ ) {

2
plugins/dspam
View File

@ -200,8 +200,6 @@ ie, (Trust smtpd).
use strict; use strict;
use warnings; use warnings;
use lib 'lib';
use Qpsmtpd::Constants; use Qpsmtpd::Constants;
use Qpsmtpd::DSN; use Qpsmtpd::DSN;
use IO::Handle; use IO::Handle;

1
plugins/ident/geoip
View File

@ -123,7 +123,6 @@ http://smartech.gatech.edu/bitstream/handle/1853/25135/GT-CSE-08-02.pdf
use strict; use strict;
use warnings; use warnings;
use lib 'lib';
use Qpsmtpd::Constants; use Qpsmtpd::Constants;
#use GeoIP2; # eval'ed in register() #use GeoIP2; # eval'ed in register()

1
plugins/resolvable_fromhost
View File

@ -70,7 +70,6 @@ Default: temp (temporary, aka soft, aka 4xx).
use strict; use strict;
use warnings; use warnings;
use lib 'lib';
use Qpsmtpd::Constants; use Qpsmtpd::Constants;
use Qpsmtpd::DSN; use Qpsmtpd::DSN;
use Qpsmtpd::TcpServer; use Qpsmtpd::TcpServer;

1
plugins/uribl
View File

@ -92,7 +92,6 @@ may be used and redistributed under the same terms as qpsmtpd itself.
use strict; use strict;
use warnings; use warnings;
use lib 'lib';
use Qpsmtpd::Constants; use Qpsmtpd::Constants;
use Time::HiRes qw(time); use Time::HiRes qw(time);