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