Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Petry <vincent@nextcloud.com>2022-09-28 16:09:03 +0300
committerGitHub <noreply@github.com>2022-09-28 16:09:03 +0300
commit20b75480d0cbeb004b244bd3777d703821adeb1d (patch)
tree4437eb827e1cae7f26ea00c754259eefe98eaca4
parent980ba657344f418f7ae0f5be3f09c2df4113dee5 (diff)
parentb427ccd065e01330b693fd13a1247945021ce588 (diff)
Merge pull request #34152 from nextcloud/bugfix/noid/db-password-install
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 e3004c269bc..caa73edccec 100644
--- a/lib/private/Setup/MySQL.php
+++ b/lib/private/Setup/MySQL.php
@@ -183,6 +183,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.', [