webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

BUG10965: only write auth.conf if username/password are set

Browse Source 
auth.conf was always written, even if no username/password provided.
In this case only the ip or Hostname of the mailserver was written into
auth.conf. Now the file is only filled if username/password are filled.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Tested-by: Timo Eissler <timo.eissler@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Alexander Marx
2015-10-31 07:34:56 +01:00
committed by Michael Tremer
parent 63cbd2c1df
commit 4bfec109e7
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
html/cgi-bin/mail.cgi
View File

@@ -110,9 +110,12 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ #SaveButton on configsite
$mail{'SENDER'} = $cgiparams{'txt_mailsender'};
$mail{'RECIPIENT'} = $cgiparams{'txt_recipient'};
$auth{'AUTHNAME'} = $cgiparams{'txt_mailuser'};
$auth{'AUTHPASS'} = $cgiparams{'txt_mailpass'};
$auth{'AUTHHOST'} = $cgiparams{'txt_mailserver'};
if ($cgiparams{'txt_mailuser'} && $cgiparams{'txt_mailpass'}) {
$auth{'AUTHNAME'} = $cgiparams{'txt_mailuser'};
$auth{'AUTHPASS'} = $cgiparams{'txt_mailpass'};
$auth{'AUTHHOST'} = $cgiparams{'txt_mailserver'};
print TXT1 "$auth{'AUTHNAME'}|$auth{'AUTHHOST'}:$auth{'AUTHPASS'}\n";
}
$dma{'SMARTHOST'} = $cgiparams{'txt_mailserver'};
$dma{'PORT'} = $cgiparams{'txt_mailport'};
@@ -129,7 +132,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ #SaveButton on configsite
print TXT "$k $v\n";
}
close TXT;
print TXT1 "$auth{'AUTHNAME'}|$auth{'AUTHHOST'}:$auth{'AUTHPASS'}\n";
close TXT1;
close TXT2;
}else{