[svn:qpsmtpd] r874 - in trunk: lib lib/Qpsmtpd plugins

[msergeant]

Author: msergeant
Date: Tue Apr  8 03:34:25 2008
New Revision: 874

Modified:
   trunk/lib/Qpsmtpd.pm
   trunk/lib/Qpsmtpd/SMTP.pm
   trunk/plugins/tls

Log:
Fix auth and tls in light of globalised hooks


Modified: trunk/lib/Qpsmtpd.pm
==============================================================================
--- trunk/lib/Qpsmtpd.pm        (original)
+++ trunk/lib/Qpsmtpd.pm        Tue Apr  8 03:34:25 2008
@@ -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

Modified: trunk/lib/Qpsmtpd/SMTP.pm
==============================================================================
--- trunk/lib/Qpsmtpd/SMTP.pm   (original)
+++ trunk/lib/Qpsmtpd/SMTP.pm   Tue Apr  8 03:34:25 2008
@@ -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;

Modified: trunk/plugins/tls
==============================================================================
--- trunk/plugins/tls   (original)
+++ trunk/plugins/tls   Tue Apr  8 03:34:25 2008
@@ -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 ) {