michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Allow HELO name to be specified https://sourceforge.net/p/webadmin/discussion/600155/thread/4a465885/

Browse Source
This commit is contained in:
Jamie Cameron
2013-12-18 14:44:47 -08:00
parent 6e90e8eb04
commit 0453ccb044
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mailboxes/boxes-lib.pl
View File

@@ -878,11 +878,12 @@ elsif ($sm) {
# Connect to SMTP server
&open_socket($sm, $port, MAIL);
&smtp_command(MAIL);
my $helo = $config{'helo_name'} || &get_system_hostname();
if ($esmtp) {
&smtp_command(MAIL, "ehlo ".&get_system_hostname()."\r\n");
&smtp_command(MAIL, "ehlo $helo\r\n");
}
else {
&smtp_command(MAIL, "helo ".&get_system_hostname()."\r\n");
&smtp_command(MAIL, "helo $helo\r\n");
}
# Get username and password from parameters, or from module config

1
mailboxes/config.info
View File

@@ -53,6 +53,7 @@ from_virtualmin=Get From: address from Virtualmin?,1,1-Yes,0-No
from_dom=Domain to use in From: address,3,System hostname
no_orig_ip=Include browser IP in X-Originating-IP header?,1,0-Yes,1-No
no_mailer=Include Webmin version in X-Mailer header?,1,0-Yes,1-No
helo_name=Hostname to use in SMTP HELO line,3,Same as system hostname
line1=System configuration,11
mail_system=Mail server installed,4,1-Sendmail,0-Postfix,2-Qmail,4-Qmail+LDAP,5-Qmail+VPopMail,6-Exim,3-Detect automatically