Skip to content

Commit bd25361

Browse files
committed
Fixed issue #6389 mail server not configured correctly
1 parent 48d4a49 commit bd25361

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

install/lib/installer_base.lib.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1653,7 +1653,7 @@ public function configure_amavis() {
16531653
//* These postconf commands will be executed on installation and update
16541654
$server_ini_rec = $this->db->queryOneRecord("SELECT mail_server, config FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . '.server', $conf['server_id']);
16551655
$server_ini_array = ini_to_array(stripslashes($server_ini_rec['config']));
1656-
$mail_server = ($server_ini_rec['mail_server']) ? true : false;
1656+
$mail_server = $conf['services']['mail'];
16571657
unset($server_ini_rec);
16581658

16591659
// amavisd user config file
@@ -1777,7 +1777,7 @@ public function configure_rspamd() {
17771777
//* These postconf commands will be executed on installation and update
17781778
$server_ini_rec = $this->db->queryOneRecord("SELECT mail_server, config FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . '.server', $conf['server_id']);
17791779
$server_ini_array = ini_to_array(stripslashes($server_ini_rec['config']));
1780-
$mail_server = ($server_ini_rec['mail_server']) ? true : false;
1780+
$mail_server = $conf['services']['mail'];
17811781
unset($server_ini_rec);
17821782

17831783
$config_dir = $conf['postfix']['config_dir'];

0 commit comments

Comments
 (0)