e-smith-email/sme7/e-smith-email-5.0.0-HeloHost.patch

diff -up e-smith-email-5.2.0/root/usr/local/sbin/smtp-auth-proxy.pl.HeloHost e-smith-email-5.2.0/root/usr/local/sbin/smtp-auth-proxy.pl
--- e-smith-email-5.2.0/root/usr/local/sbin/smtp-auth-proxy.pl.HeloHost 2008-03-11 18:03:25.000000000 +0100
+++ e-smith-email-5.2.0/root/usr/local/sbin/smtp-auth-proxy.pl  2009-12-21 21:57:02.000000000 +0100
@@ -29,6 +29,8 @@ sub options {
     $prop->{SystemName} = $config->get_value('SystemName');
     $prop->{DomainName} = $config->get_value('DomainName');
     $prop->{PeerPort} = $smtp_proxy_rec->prop('PeerPort') || 25;
+    $prop->{Helo} = $config->get('smtpd')->prop('HeloHost') ||
+        "$prop->{SystemName}.$prop->{DomainName}";
 }
 
 esmith::SMTPAuthProxy->run(
@@ -52,6 +54,7 @@ sub process_request
     my $user = $self->get_property('user');
     my $domain_name = $self->get_property('DomainName');
     my $system_name = $self->get_property('SystemName');
+    my $helo = $self->get_property('Helo');
     my $name = $self->get_property('Userid');
     my $pass = $self->get_property('Passwd');
     my $debug = (($self->get_property('Debug') || 'disabled') eq 'enabled')
@@ -74,7 +77,7 @@ sub process_request
 
     my $class = ($port == 465) ? 'Net::SMTP::SSL' : 'Net::SMTP';
     my $smtp = $class->new($smarthost,
-                            Hello => "${system_name}.${domain_name}",
+                            Hello => Hello => $helo,
                             Debug => $debug,
                             Port => $port,
                         );
1	filippocarletti	1.1	diff -up e-smith-email-5.2.0/root/usr/local/sbin/smtp-auth-proxy.pl.HeloHost e-smith-email-5.2.0/root/usr/local/sbin/smtp-auth-proxy.pl
2			--- e-smith-email-5.2.0/root/usr/local/sbin/smtp-auth-proxy.pl.HeloHost 2008-03-11 18:03:25.000000000 +0100
3			+++ e-smith-email-5.2.0/root/usr/local/sbin/smtp-auth-proxy.pl 2009-12-21 21:57:02.000000000 +0100
4			@@ -29,6 +29,8 @@ sub options {
5			$prop->{SystemName} = $config->get_value('SystemName');
6			$prop->{DomainName} = $config->get_value('DomainName');
7			$prop->{PeerPort} = $smtp_proxy_rec->prop('PeerPort') \|\| 25;
8			+ $prop->{Helo} = $config->get('smtpd')->prop('HeloHost') \|\|
9			+ "$prop->{SystemName}.$prop->{DomainName}";
10			}
11
12			esmith::SMTPAuthProxy->run(
13			@@ -52,6 +54,7 @@ sub process_request
14			my $user = $self->get_property('user');
15			my $domain_name = $self->get_property('DomainName');
16			my $system_name = $self->get_property('SystemName');
17			+ my $helo = $self->get_property('Helo');
18			my $name = $self->get_property('Userid');
19			my $pass = $self->get_property('Passwd');
20			my $debug = (($self->get_property('Debug') \|\| 'disabled') eq 'enabled')
21			@@ -74,7 +77,7 @@ sub process_request
22
23			my $class = ($port == 465) ? 'Net::SMTP::SSL' : 'Net::SMTP';
24			my $smtp = $class->new($smarthost,
25			- Hello => "${system_name}.${domain_name}",
26			+ Hello => Hello => $helo,
27			Debug => $debug,
28			Port => $port,
29			);