1 |
stephdl |
1.1 |
diff -up qpsmtpd-0.83/plugins/tls.loginit qpsmtpd-0.83/plugins/tls |
2 |
|
|
--- qpsmtpd-0.83/plugins/tls.loginit 2009-09-22 04:49:27.000000000 -0600 |
3 |
|
|
+++ qpsmtpd-0.83/plugins/tls 2009-10-31 10:44:51.000000000 -0600 |
4 |
|
|
@@ -67,7 +67,7 @@ sub init { |
5 |
|
|
$key ||= 'ssl/qpsmtpd-server.key'; |
6 |
|
|
$ca ||= 'ssl/qpsmtpd-ca.crt'; |
7 |
|
|
unless ( -f $cert && -f $key && -f $ca ) { |
8 |
|
|
- $self->log(LOGERROR, "Cannot locate cert/key! Run plugins/tls_cert to generate"); |
9 |
|
|
+ Qpsmtpd->varlog(LOGERROR, "init", "tls", "Cannot locate cert/key! Run plugins/tls_cert to generate"); |
10 |
|
|
return; |
11 |
|
|
} |
12 |
|
|
$self->tls_cert($cert); |
13 |
|
|
@@ -75,7 +75,7 @@ sub init { |
14 |
|
|
$self->tls_ca($ca); |
15 |
|
|
$self->tls_ciphers($self->qp->config('tls_ciphers') || 'HIGH'); |
16 |
|
|
|
17 |
|
|
- $self->log(LOGINFO, "ciphers: ".$self->tls_ciphers); |
18 |
|
|
+ Qpsmtpd->varlog(LOGINFO, "init", "tls", "ciphers: ".$self->tls_ciphers); |
19 |
|
|
|
20 |
|
|
local $^W; # this bit is very noisy... |
21 |
|
|
my $ssl_ctx = IO::Socket::SSL::SSL_Context->new( |