qpsmtpd/sme7/qpsmtpd-0.40-peer_hooks.patch

--- qpsmtpd-0.40/lib/Qpsmtpd/SMTP.pm.peer_hooks 2007-06-14 11:57:27.000000000 -0600
+++ qpsmtpd-0.40/lib/Qpsmtpd/SMTP.pm    2007-06-14 13:44:52.000000000 -0600
@@ -95,6 +95,11 @@
     my $self = shift;
     # this should maybe be called something else than "connect", see
     # lib/Qpsmtpd/TcpServer.pm for more confusion.
+    my ($rc, $msg) = $self->run_hooks("set_hooks");
+    if ($rc == DENY) {
+      $self->respond(550, ($msg || 'Connection from you denied, bye bye.'));
+      return $rc;
+    }
     $self->run_hooks("connect");
     return DONE;
 }
@@ -278,7 +283,9 @@
 
     # if we don't have a plugin implementing this auth mechanism, 504
     if( exists $auth_mechanisms{uc($mechanism)} ) {
-      return $self->{_auth} = Qpsmtpd::Auth::SASL( $self, $mechanism, @stuff );
+      $self->{_auth} = Qpsmtpd::Auth::SASL( $self, $mechanism, @stuff );
+      $self->run_hooks("valid_auth") if $self->{_auth} == OK;
+      return $self->{_auth};
     } else {
       $self->respond( 504, "Unimplemented authentification mechanism: $mechanism" );
       return DENY;
--- qpsmtpd-0.40/lib/Qpsmtpd/Plugin.pm.peer_hooks       2007-06-14 11:57:27.000000000 -0600
+++ qpsmtpd-0.40/lib/Qpsmtpd/Plugin.pm  2007-06-14 13:43:53.000000000 -0600
@@ -6,7 +6,7 @@
 our @hooks = qw(
     logging config pre-connection connect ehlo_parse ehlo
     helo_parse helo auth_parse auth auth-plain auth-login auth-cram-md5
-    rcpt_parse rcpt_pre rcpt mail_parse mail mail_pre 
+    valid_auth set_hooks rcpt_parse rcpt_pre rcpt mail_parse mail mail_pre 
     data data_post queue_pre queue queue_post
     quit reset_transaction disconnect post-connection
     unrecognized_command deny ok received_line
1	slords	1.1	--- qpsmtpd-0.40/lib/Qpsmtpd/SMTP.pm.peer_hooks 2007-06-14 11:57:27.000000000 -0600
2			+++ qpsmtpd-0.40/lib/Qpsmtpd/SMTP.pm 2007-06-14 13:44:52.000000000 -0600
3			@@ -95,6 +95,11 @@
4			my $self = shift;
5			# this should maybe be called something else than "connect", see
6			# lib/Qpsmtpd/TcpServer.pm for more confusion.
7			+ my ($rc, $msg) = $self->run_hooks("set_hooks");
8			+ if ($rc == DENY) {
9			+ $self->respond(550, ($msg \|\| 'Connection from you denied, bye bye.'));
10			+ return $rc;
11			+ }
12			$self->run_hooks("connect");
13			return DONE;
14			}
15			@@ -278,7 +283,9 @@
16
17			# if we don't have a plugin implementing this auth mechanism, 504
18			if( exists $auth_mechanisms{uc($mechanism)} ) {
19			- return $self->{_auth} = Qpsmtpd::Auth::SASL( $self, $mechanism, @stuff );
20			+ $self->{_auth} = Qpsmtpd::Auth::SASL( $self, $mechanism, @stuff );
21			+ $self->run_hooks("valid_auth") if $self->{_auth} == OK;
22			+ return $self->{_auth};
23			} else {
24			$self->respond( 504, "Unimplemented authentification mechanism: $mechanism" );
25			return DENY;
26			--- qpsmtpd-0.40/lib/Qpsmtpd/Plugin.pm.peer_hooks 2007-06-14 11:57:27.000000000 -0600
27			+++ qpsmtpd-0.40/lib/Qpsmtpd/Plugin.pm 2007-06-14 13:43:53.000000000 -0600
28			@@ -6,7 +6,7 @@
29			our @hooks = qw(
30			logging config pre-connection connect ehlo_parse ehlo
31			helo_parse helo auth_parse auth auth-plain auth-login auth-cram-md5
32			- rcpt_parse rcpt_pre rcpt mail_parse mail mail_pre
33			+ valid_auth set_hooks rcpt_parse rcpt_pre rcpt mail_parse mail mail_pre
34			data data_post queue_pre queue queue_post
35			quit reset_transaction disconnect post-connection
36			unrecognized_command deny ok received_line