| 1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.17.0/root/usr/local/sbin/smtp-auth-proxy.pl mezzanine_patched_e-smith-email-4.17.0/root/usr/local/sbin/smtp-auth-proxy.pl |
| 2 |
--- e-smith-email-4.17.0/root/usr/local/sbin/smtp-auth-proxy.pl 2007-12-26 14:48:39.000000000 -0500 |
| 3 |
+++ mezzanine_patched_e-smith-email-4.17.0/root/usr/local/sbin/smtp-auth-proxy.pl 2007-12-26 16:00:23.000000000 -0500 |
| 4 |
@@ -6,6 +6,7 @@ |
| 5 |
use vars qw(@ISA); |
| 6 |
use Net::Server::Fork; |
| 7 |
use Net::SMTP; |
| 8 |
+use Net::SMTP::SSL; |
| 9 |
use esmith::ConfigDB; |
| 10 |
|
| 11 |
@ISA = qw(Net::Server::Fork); |
| 12 |
@@ -27,6 +28,7 @@ |
| 13 |
$prop->{Debug} = $smtp_proxy_rec->prop('Debug'); |
| 14 |
$prop->{SystemName} = $config->get_value('SystemName'); |
| 15 |
$prop->{DomainName} = $config->get_value('DomainName'); |
| 16 |
+ $prop->{PeerPort} = $smtp_proxy_rec->prop('PeerPort') || 25; |
| 17 |
} |
| 18 |
|
| 19 |
esmith::SMTPAuthProxy->run( |
| 20 |
@@ -46,6 +48,7 @@ |
| 21 |
my $kidpid; |
| 22 |
|
| 23 |
my $smarthost = $self->get_property('SMTPSmartHost'); |
| 24 |
+ my $port = $self->get_property('PeerPort'); |
| 25 |
my $user = $self->get_property('user'); |
| 26 |
my $domain_name = $self->get_property('DomainName'); |
| 27 |
my $system_name = $self->get_property('SystemName'); |
| 28 |
@@ -69,14 +72,16 @@ |
| 29 |
exit; |
| 30 |
} |
| 31 |
|
| 32 |
- my $smtp = Net::SMTP->new($smarthost, |
| 33 |
+ my $class = ($port == 465) ? 'Net::SMTP::SSL' : 'Net::SMTP'; |
| 34 |
+ my $smtp = $class->new($smarthost, |
| 35 |
Hello => "${system_name}.${domain_name}", |
| 36 |
- Debug => $debug |
| 37 |
+ Debug => $debug, |
| 38 |
+ Port => $port, |
| 39 |
); |
| 40 |
unless ($smtp) |
| 41 |
{ |
| 42 |
print "451 Upstream SMTP server not available\n"; |
| 43 |
- warn "No SMTP connection to ISP server\n"; |
| 44 |
+ warn "No SMTP connection to server $smarthost on port $port\n"; |
| 45 |
exit; |
| 46 |
} |
| 47 |
|
Parent Directory
| 
Revision Log
| 
Revision Graph
