10 |
unless $plugin_line =~ /logging/; |
unless $plugin_line =~ /logging/; |
11 |
last PLUGIN_DIR; |
last PLUGIN_DIR; |
12 |
} |
} |
13 |
@@ -69,10 +69,8 @@ sub init { |
@@ -69,7 +69,9 @@ sub init { |
14 |
sub _peer_plugins { |
sub _peer_plugins { |
15 |
my $qp = shift; |
my $qp = shift; |
16 |
my $config = shift; |
my $config = shift; |
17 |
- $qp->{hooks} = {}; |
- $qp->{hooks} = {}; |
18 |
|
+ |
19 |
|
+ my $hooks; |
20 |
|
+ $hooks->{$_} = delete $qp->hooks->{$_} foreach keys %{$qp->hooks}; |
21 |
|
|
22 |
my @plugins = $qp->config($config); |
my @plugins = $qp->config($config); |
23 |
- unshift @plugins, "peers $config"; |
unshift @plugins, "peers $config"; |
24 |
my @loaded; |
@@ -79,6 +81,7 @@ sub _peer_plugins { |
25 |
|
my $this_plugin = $qp->_load_plugin($plugin_line, $qp->plugin_dirs); |
26 |
|
push @loaded, $this_plugin if $this_plugin; |
27 |
|
} |
28 |
|
+ unshift @{$qp->hooks->{connect}}, @{$hooks->{connect}} if exists $hooks->{connect} && $hook eq 'set_hooks'; |
29 |
|
|
30 |
for my $plugin_line (@plugins) { |
return @loaded; |
31 |
|
} |
32 |
diff -up smeserver-qpsmtpd-2.0.0/root/var/service/qpsmtpd/config/plugins.qpsmtpd83 smeserver-qpsmtpd-2.0.0/root/var/service/qpsmtpd/config/plugins |
diff -up smeserver-qpsmtpd-2.0.0/root/var/service/qpsmtpd/config/plugins.qpsmtpd83 smeserver-qpsmtpd-2.0.0/root/var/service/qpsmtpd/config/plugins |
33 |
--- smeserver-qpsmtpd-2.0.0/root/var/service/qpsmtpd/config/plugins.qpsmtpd83 2008-10-07 09:02:36.000000000 -0600 |
--- smeserver-qpsmtpd-2.0.0/root/var/service/qpsmtpd/config/plugins.qpsmtpd83 2008-10-07 09:02:36.000000000 -0600 |
34 |
+++ smeserver-qpsmtpd-2.0.0/root/var/service/qpsmtpd/config/plugins 2009-10-29 13:50:03.000000000 -0600 |
+++ smeserver-qpsmtpd-2.0.0/root/var/service/qpsmtpd/config/plugins 2009-10-29 13:50:03.000000000 -0600 |