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>
$mail{'SENDER'} = $cgiparams{'txt_mailsender'};
$mail{'RECIPIENT'} = $cgiparams{'txt_recipient'};
$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'};
$dma{'SMARTHOST'} = $cgiparams{'txt_mailserver'};
$dma{'PORT'} = $cgiparams{'txt_mailport'};
print TXT "$k $v\n";
}
close TXT;
print TXT "$k $v\n";
}
close TXT;
- print TXT1 "$auth{'AUTHNAME'}|$auth{'AUTHHOST'}:$auth{'AUTHPASS'}\n";