composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°8638 - Adapt mysqldump calls to follow iTop SSL configuration

Browse Source 
- fix unitary test
This commit is contained in:
Benjamin DALSASS
2026-04-14 08:54:54 +02:00
parent 7201bef8db
commit 87dd003a6d
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/backup.class.inc.php
View File

@@ -511,7 +511,7 @@ EOF;
{ {
$bDbTlsEnabled = $oConfig->Get('db_tls.enabled'); $bDbTlsEnabled = $oConfig->Get('db_tls.enabled');
if (!$bDbTlsEnabled) { if (!$bDbTlsEnabled) {
return CMDBSource::IsSslModeDBVersion() ? ' --skip-ssl' : ''; return CMDBSource::IsSslModeDBVersion() ? ' --skip-ssl' : '';
} }
$sTlsOptions = ''; $sTlsOptions = '';
// Mysql 5.7.11 and upper deprecated --ssl and uses --ssl-mode instead // Mysql 5.7.11 and upper deprecated --ssl and uses --ssl-mode instead

6
tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php
View File

@@ -45,7 +45,11 @@ class DBBackupTest extends ItopTestCase
$oConfigToTest->Set('db_tls.enabled', false); $oConfigToTest->Set('db_tls.enabled', false);
$sCliArgsNoTls = DBBackup::GetMysqlCliTlsOptions($oConfigToTest); $sCliArgsNoTls = DBBackup::GetMysqlCliTlsOptions($oConfigToTest);
$this->assertEmpty($sCliArgsNoTls); if (CMDBSource::IsSslModeDBVersion()) {
$this->assertEquals(' --skip-ssl', $sCliArgsNoTls);
} else {
$this->assertEmpty($sCliArgsNoTls);
}
} }
/** /**