Author: jpeacock
Date: Wed Feb 7 13:49:45 2007
New Revision: 711
Modified:
trunk/lib/Qpsmtpd.pm
trunk/lib/Qpsmtpd/PollServer.pm
trunk/plugins/check_earlytalker
Log:
Add authenticated method to base Qpsmtpd object.
Add _auth field to PollServer.
Make sure that check_earlytalker works with PollServer.
Modified: trunk/lib/Qpsmtpd.pm
==============================================================================
--- trunk/lib/Qpsmtpd.pm (original)
+++ trunk/lib/Qpsmtpd.pm Wed Feb 7 13:49:45 2007
@@ -497,6 +497,11 @@
return $Size_threshold;
}
+sub authenticated {
+ my $self = shift;
+ return (defined $self->{_auth} ? $self->{_auth} : "" );
+}
+
sub auth_user {
my $self = shift;
return (defined $self->{_auth_user} ? $self->{_auth_user} : "" );
Modified: trunk/lib/Qpsmtpd/PollServer.pm
==============================================================================
--- trunk/lib/Qpsmtpd/PollServer.pm (original)
+++ trunk/lib/Qpsmtpd/PollServer.pm Wed Feb 7 13:49:45 2007
@@ -15,6 +15,7 @@
hooks
start_time
cmd_timeout
+ _auth
_auth_mechanism
_auth_state
_auth_ticket
Modified: trunk/plugins/check_earlytalker
==============================================================================
--- trunk/plugins/check_earlytalker (original)
+++ trunk/plugins/check_earlytalker Wed Feb 7 13:49:45 2007
@@ -66,7 +66,7 @@
'defer-reject' => 0,
@args,
};
- if ($qp->{conn} && $qp->{conn}->isa('Apache2::Connection')) {
+ if (exists $qp->{conn} && $qp->{conn}->isa('Apache2::Connection')) {
require APR::Const;
APR::Const->import(qw(POLLIN SUCCESS));
$self->register_hook('connect', 'apr_connect_handler');