diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php index b268c27c98c..cf07784e436 100644 --- a/htdocs/admin/system/security.php +++ b/htdocs/admin/system/security.php @@ -323,7 +323,7 @@ if (empty($dolibarr_main_restrict_os_commands)) { } else { print $dolibarr_main_restrict_os_commands; } -print ' ('.$langs->trans("RecommendedValueIs", 'mysqldump, mysql, pg_dump, pgrestore, clamdscan').')'; +print ' ('.$langs->trans("RecommendedValueIs", 'mysqldump, mysql, pg_dump, pgrestore, mariadb, mariadb-dump, clamdscan').')'; print '
'; if (empty($conf->global->SECURITY_DISABLE_TEST_ON_OBFUSCATED_CONF)) { diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index f186080a2a2..d1eedc42427 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -284,11 +284,11 @@ $dolibarr_main_prod='1'; // ================================== // To restrict commands you can execute by the backup feature, enter allowed command here. // Note: If you can, defining permission on OS linux (using SELinux for example) may be a better choice. -// Default value: 'mysqldump, mysql, pg_dump, pgrestore' +// Default value: 'mysqldump, mysql, pg_dump, pgrestore, mariadb, mariadb-dump' // Examples: // $dolibarr_main_restrict_os_commands='mysqldump, /usr/local/bin/otherdumptool'; // -$dolibarr_main_restrict_os_commands='mysqldump, mysql, pg_dump, pgrestore'; +$dolibarr_main_restrict_os_commands='mysqldump, mysql, pg_dump, pgrestore, mariadb, mariadb-dump'; // dolibarr_main_restrict_ip // ========================= diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php index 043ffa30c7a..c0b737eed09 100644 --- a/htdocs/install/step1.php +++ b/htdocs/install/step1.php @@ -920,7 +920,7 @@ function write_conf_file($conffile) fputs($fp, '$dolibarr_main_force_https=\''.$main_force_https.'\';'); fputs($fp, "\n"); - fputs($fp, '$dolibarr_main_restrict_os_commands=\'mysqldump, mysql, pg_dump, pgrestore, clamdscan, clamscan.exe\';'); + fputs($fp, '$dolibarr_main_restrict_os_commands=\'mysqldump, mysql, pg_dump, pgrestore, mariadb, mariadb-dump, clamdscan, clamscan.exe\';'); fputs($fp, "\n"); fputs($fp, '$dolibarr_nocsrfcheck=\'0\';');