[svn:qpsmtpd] r820 - contrib/vetinari/hook_skip

[vetinari]

Author: vetinari
Date: Wed Nov 28 12:02:23 2007
New Revision: 820

Modified:
   contrib/vetinari/hook_skip/hook_skip-0.42rc1-r818.diff

Log:
hook_skip: fix for some hooks (notably DATA)...

Modified: contrib/vetinari/hook_skip/hook_skip-0.42rc1-r818.diff
==============================================================================
--- contrib/vetinari/hook_skip/hook_skip-0.42rc1-r818.diff      (original)
+++ contrib/vetinari/hook_skip/hook_skip-0.42rc1-r818.diff      Wed Nov 28 
12:02:23 2007
@@ -1,8 +1,8 @@
 Index: lib/Qpsmtpd.pm
 ===================================================================
---- lib/Qpsmtpd.pm     (revision 818)
-+++ lib/Qpsmtpd.pm     (working copy)
-@@ -372,6 +372,13 @@
+--- lib/Qpsmtpd.pm      (revision 818)
++++ lib/Qpsmtpd.pm      (working copy)
+@@ -372,6 +372,15 @@
        $@ and warn("FATAL LOGGING PLUGIN ERROR: ", $@) and next;
      }
      else {
@@ -10,8 +10,10 @@
 +        @r = $self->run_hooks("skip", $code->{name}, $hook);
 +        if (defined $r[0] && $r[0] == DENY) {
 +          $self->log(LOGDEBUG, "Skipping plugin ".$code->{name});
++         $r[0] = DECLINED;
 +          next;
 +        }
++       # $r[0] = DECLINED; # maybe we need this too
 +      }
        $self->varlog(LOGDEBUG, $hook, $code->{name});
        eval { (@r) = $code->{code}->($self, $self->transaction, @$args); };