From 89231976f8dda6ec9fbab99345c53905278f116d Mon Sep 17 00:00:00 2001 From: Benjamin DALSASS Date: Thu, 16 Apr 2026 15:00:01 +0200 Subject: [PATCH] =?UTF-8?q?Revert=20N=C2=B08638=20-=20Adapt=20mysqldump=20?= =?UTF-8?q?calls=20to=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 +- tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php | 6 +----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/core/cmdbsource.class.inc.php b/core/cmdbsource.class.inc.php index fa62040cf2..4ea759ae93 100644 --- a/core/cmdbsource.class.inc.php +++ b/core/cmdbsource.class.inc.php @@ -1592,8 +1592,6 @@ 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 142cd630f8..f1609791be 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 CMDBSource::IsSslModeDBVersion() ? ' --skip-ssl' : ''; + return ''; } $sTlsOptions = ''; // Mysql 5.7.11 and upper deprecated --ssl and uses --ssl-mode instead diff --git a/tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php b/tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php index bad982ce1a..37a582df10 100644 --- a/tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php +++ b/tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php @@ -45,11 +45,7 @@ class DBBackupTest extends ItopTestCase $oConfigToTest->Set('db_tls.enabled', false); $sCliArgsNoTls = DBBackup::GetMysqlCliTlsOptions($oConfigToTest); - if (CMDBSource::IsSslModeDBVersion()) { - $this->assertEquals(' --skip-ssl', $sCliArgsNoTls); - } else { - $this->assertEmpty($sCliArgsNoTls); - } + $this->assertEmpty($sCliArgsNoTls); } /**