On Sun, 30 Mar 2008 21:51:26 -0700 Ask Bjørn Hansen <[EMAIL PROTECTED]> wrote:
> > On Mar 30, 2008, at 4:39 PM, Markus Ullmann wrote: > > > After tracing it down to rev 814-818, a friend of mine came up with > > this patch and it seems to make it work for me again. Maybe someone > > with deep qpsmtpd knowledge could take a look at it > > > I think the patch breaks a feature of being able to change the hooks > per Qpsmtpd instance ... Is that right? Don't think so. I'd prefer to have them "exported" like in the attached diff. Someone test if this works with the tls plugin? Hanno
Index: lib/Qpsmtpd.pm =================================================================== --- lib/Qpsmtpd.pm (revision 872) +++ lib/Qpsmtpd.pm (working copy) @@ -29,6 +29,8 @@ my $LOGGING_LOADED = 0; +sub hooks { $hooks; } + sub load_logging { # need to do this differently that other plugins so as to # not trigger logging activity Index: lib/Qpsmtpd/SMTP.pm =================================================================== --- lib/Qpsmtpd/SMTP.pm (revision 872) +++ lib/Qpsmtpd/SMTP.pm (working copy) @@ -219,7 +219,7 @@ : (); # Check for possible AUTH mechanisms -HOOK: foreach my $hook ( keys %{$self->{hooks}} ) { +HOOK: foreach my $hook ( keys %{$self->hooks} ) { if ( $hook =~ m/^auth-?(.+)?$/ ) { if ( defined $1 ) { $auth_mechanisms{uc($1)} = 1; Index: plugins/tls =================================================================== --- plugins/tls (revision 872) +++ plugins/tls (working copy) @@ -91,7 +91,7 @@ $self->ssl_context($ssl_ctx); # Check for possible AUTH mechanisms -HOOK: foreach my $hook ( keys %{$qp->{hooks}} ) { +HOOK: foreach my $hook ( keys %{$qp->hooks} ) { no strict 'refs'; if ( $hook =~ m/^auth-?(.+)?$/ ) { if ( defined $1 ) {