From f049a364bd6b95ccb2a362ffa915be83036c0198 Mon Sep 17 00:00:00 2001 From: Benjamin DALSASS Date: Mon, 13 Apr 2026 15:19:33 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B08638=20-=20Adapt=20mysqldump=20calls=20t?= =?UTF-8?q?o=20follow=20iTop=20SSL=20configuration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/cmdbsource.class.inc.php | 2 ++ setup/backup.class.inc.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/cmdbsource.class.inc.php b/core/cmdbsource.class.inc.php index 4ea759ae93..fa62040cf2 100644 --- a/core/cmdbsource.class.inc.php +++ b/core/cmdbsource.class.inc.php @@ -1592,6 +1592,8 @@ class CMDBSource if (static::GetDBVendor() === static::ENUM_DB_VENDOR_MYSQL) { //Mysql 5.7.0 and upper deprecated --ssl and uses --ssl-mode instead return version_compare(static::GetDBVersion(), '5.7.11', '>='); + } elseif (static::GetDBVendor() === static::ENUM_DB_VENDOR_MARIADB) { + return version_compare(static::GetDBVersion(), '10.2.6', '>='); } return false; } diff --git a/setup/backup.class.inc.php b/setup/backup.class.inc.php index f1609791be..c02c27ef61 100644 --- a/setup/backup.class.inc.php +++ b/setup/backup.class.inc.php @@ -511,7 +511,7 @@ EOF; { $bDbTlsEnabled = $oConfig->Get('db_tls.enabled'); if (!$bDbTlsEnabled) { - return ''; + return CMDBSource::IsSslModeDBVersion() ? ' --skip-ssl' : ''; } $sTlsOptions = ''; // Mysql 5.7.11 and upper deprecated --ssl and uses --ssl-mode instead