e-smith-email/sme7/e-smith-email-4.17.0-SSL_port.patch

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
--- e-smith-email-4.17.0/root/usr/local/sbin/smtp-auth-proxy.pl 2007-12-26 14:48:39.000000000 -0500
+++ mezzanine_patched_e-smith-email-4.17.0/root/usr/local/sbin/smtp-auth-proxy.pl       2007-12-26 16:00:23.000000000 -0500
@@ -6,6 +6,7 @@
 use vars qw(@ISA);
 use Net::Server::Fork;
 use Net::SMTP;
+use Net::SMTP::SSL;
 use esmith::ConfigDB;
 
 @ISA = qw(Net::Server::Fork);
@@ -27,6 +28,7 @@
     $prop->{Debug} = $smtp_proxy_rec->prop('Debug');
     $prop->{SystemName} = $config->get_value('SystemName');
     $prop->{DomainName} = $config->get_value('DomainName');
+    $prop->{PeerPort} = $smtp_proxy_rec->prop('PeerPort') || 25;
 }
 
 esmith::SMTPAuthProxy->run(
@@ -46,6 +48,7 @@
     my $kidpid;
 
     my $smarthost = $self->get_property('SMTPSmartHost');
+    my $port = $self->get_property('PeerPort');
     my $user = $self->get_property('user');
     my $domain_name = $self->get_property('DomainName');
     my $system_name = $self->get_property('SystemName');
@@ -69,14 +72,16 @@
         exit;
     }
 
-    my $smtp = Net::SMTP->new($smarthost,
+    my $class = ($port == 465) ? 'Net::SMTP::SSL' : 'Net::SMTP';
+    my $smtp = $class->new($smarthost,
                             Hello => "${system_name}.${domain_name}",
-                            Debug => $debug
+                            Debug => $debug,
+                            Port => $port,
                         );
     unless ($smtp)
     {
         print "451 Upstream SMTP server not available\n";
-        warn "No SMTP connection to ISP server\n";
+        warn "No SMTP connection to server $smarthost on port $port\n";
         exit;
     }
 
1	slords	1.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