From 66357f0779da7af83fe1d8310849672db5b08df6 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Mon, 15 Jul 2019 19:05:45 +0200
Subject: [PATCH] - still problem with domain selector on update of ISPC
---
install/lib/installer_base.lib.php | 2 +-
install/update.php | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index f752b693d0..4db0da1ecf 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1476,7 +1476,7 @@ class installer_base {
if ( substr($mail_config['dkim_path'], strlen($mail_config['dkim_path'])-1) == '/' ) {
$mail_config['dkim_path'] = substr($mail_config['dkim_path'], 0, strlen($mail_config['dkim_path'])-1);
}
- $dkim_domains = $this->db->queryAllRecords('SELECT `dkim_selector`, `domain` FROM `mail_domain` WHERE `dkim` = ? ORDER BY `domain` ASC', 'y');
+ $dkim_domains = $this->db->queryAllRecords('SELECT `dkim_selector`, `domain` FROM ?? WHERE `dkim` = ? ORDER BY `domain` ASC', $conf['mysql']['database'] . '.mail_domain', 'y');
$fpp = fopen('/etc/rspamd/local.d/dkim_domains.map', 'w');
$fps = fopen('/etc/rspamd/local.d/dkim_selectors.map', 'w');
foreach($dkim_domains as $dkim_domain) {
diff --git a/install/update.php b/install/update.php
index b700219f2e..42ddd625f5 100644
--- a/install/update.php
+++ b/install/update.php
@@ -253,7 +253,6 @@ prepareDBDump();
//* initialize the database
$inst->db = new db();
-$inst->db->setDBName($conf['mysql']['database']);
//* initialize the master DB, if we have a multiserver setup
if($conf['mysql']['master_slave_setup'] == 'y') {
--
GitLab