summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon L <szaimen@e.mail.de>2023-01-27 13:39:03 +0100
committerGitHub <noreply@github.com>2023-01-27 13:39:03 +0100
commit8f3bdbd2b9dbb453906c70b482d341b87f987e55 (patch)
tree3428858ad498e6ad04302eb5a3d2c6c7faae4d63
parent485bc35e74d06d820be2461017ccdac9c418f453 (diff)
parentf23532b095bb2aae2f9627de2b9475560d1c4bef (diff)
downloadnextcloud-server-8f3bdbd2b9dbb453906c70b482d341b87f987e55.tar.gz
nextcloud-server-8f3bdbd2b9dbb453906c70b482d341b87f987e55.zip
Merge pull request #36401 from nextcloud/backport/34152/stable24
[stable24] Do not store generated mysql password if it was not used
-rw-r--r--lib/private/Setup/MySQL.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php
index 2c16cac3d26..fbce31b0f57 100644
--- a/lib/private/Setup/MySQL.php
+++ b/lib/private/Setup/MySQL.php
@@ -184,6 +184,9 @@ class MySQL extends AbstractDatabase {
$i++;
}
}
+ } else {
+ // Reuse existing password if a database config is already present
+ $this->dbPassword = $rootPassword;
}
} catch (\Exception $ex) {
$this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [