1 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-1.2.1/root/usr/share/qpsmtpd/plugins/peers mezzanine_patched_smeserver-qpsmtpd-1.2.1/root/usr/share/qpsmtpd/plugins/peers |
2 |
--- smeserver-qpsmtpd-1.2.1/root/usr/share/qpsmtpd/plugins/peers 2007-01-11 20:47:28.000000000 -0700 |
3 |
+++ mezzanine_patched_smeserver-qpsmtpd-1.2.1/root/usr/share/qpsmtpd/plugins/peers 2007-01-11 20:46:38.000000000 -0700 |
4 |
@@ -48,11 +48,12 @@ |
5 |
my $config = shift; |
6 |
$qp->{hooks} = {}; |
7 |
my @plugins = $qp->config($config); |
8 |
+ unshift @plugins, "peers $config"; |
9 |
$qp->log(LOGNOTICE, "loading plugin $_") foreach (@plugins); |
10 |
return $qp->_load_plugins($qp->plugin_dir, @plugins); |
11 |
} |
12 |
|
13 |
-sub hook_connect { |
14 |
+sub hook_set_hooks { |
15 |
my ($self, $transaction) = @_; |
16 |
my $qp = $self->qp; |
17 |
my $connection = $qp->connection; |
18 |
@@ -61,28 +62,20 @@ |
19 |
while ($client_ip) { |
20 |
if (-f "config/peers/$client_ip") { |
21 |
_peer_plugins($qp, "peers/$client_ip"); |
22 |
- $self->register_hook("mail", "verify_auth", 1); |
23 |
return (DECLINED); |
24 |
} |
25 |
$client_ip =~ s/\.?\d+$//; # strip off another 8 bits |
26 |
} |
27 |
if (-f "config/peers/0") { |
28 |
_peer_plugins($qp, "peers/0"); |
29 |
- $self->register_hook("mail", "verify_auth", 1); |
30 |
return (DECLINED); |
31 |
} |
32 |
return (DENY); |
33 |
} |
34 |
|
35 |
-sub verify_auth { |
36 |
- my ( $self, $transaction, $method, $user, $passClear, $passHash, $ticket ) = @_; |
37 |
- |
38 |
+sub hook_valid_auth { |
39 |
+ my ( $self, $transaction) = @_; |
40 |
my $qp = $self->qp; |
41 |
- |
42 |
- if ( $qp->auth_mechanism() and $qp->auth_user() ) |
43 |
- { |
44 |
- _peer_plugins($qp, "peers/local") if (-f "config/peers/local"); |
45 |
- } |
46 |
- |
47 |
+ _peer_plugins($qp, "peers/local") if (-f "config/peers/local"); |
48 |
return (DECLINED); |
49 |
} |