diff options
| author | provokateurin <kate@provokateurin.de> | 2025-06-20 10:34:20 +0200 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2025-06-20 10:38:18 +0000 |
| commit | 6308f3c3e8145a4961a3d21a3e038ceaf3fa90c5 (patch) | |
| tree | 41992de9ef927141a7240bfef651e8a41c740c74 | |
| parent | ab9328a17c0cc52c3f9e04ea37c482879ac066e8 (diff) | |
| download | nextcloud-server-backport/53616/stable31.tar.gz nextcloud-server-backport/53616/stable31.zip | |
fix(core): Make --password-from-env work with NC_PASS everywherebackport/53616/stable31
Signed-off-by: provokateurin <kate@provokateurin.de>
| -rw-r--r-- | core/Command/User/Add.php | 6 | ||||
| -rw-r--r-- | core/Command/User/ResetPassword.php | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/Command/User/Add.php b/core/Command/User/Add.php index 033d2bdc9a2..4de4e247991 100644 --- a/core/Command/User/Add.php +++ b/core/Command/User/Add.php @@ -52,7 +52,7 @@ class Add extends Command { 'password-from-env', null, InputOption::VALUE_NONE, - 'read password from environment variable OC_PASS' + 'read password from environment variable NC_PASS/OC_PASS' ) ->addOption( 'generate-password', @@ -91,10 +91,10 @@ class Add extends Command { // Setup password. if ($input->getOption('password-from-env')) { - $password = getenv('OC_PASS'); + $password = getenv('NC_PASS') ?: getenv('OC_PASS'); if (!$password) { - $output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>'); + $output->writeln('<error>--password-from-env given, but NC_PASS/OC_PASS is empty!</error>'); return 1; } } elseif ($input->getOption('generate-password')) { diff --git a/core/Command/User/ResetPassword.php b/core/Command/User/ResetPassword.php index 2f18c3d473e..0e8b1325770 100644 --- a/core/Command/User/ResetPassword.php +++ b/core/Command/User/ResetPassword.php @@ -41,7 +41,7 @@ class ResetPassword extends Base { 'password-from-env', null, InputOption::VALUE_NONE, - 'read password from environment variable OC_PASS' + 'read password from environment variable NC_PASS/OC_PASS' ) ; } @@ -56,9 +56,9 @@ class ResetPassword extends Base { } if ($input->getOption('password-from-env')) { - $password = getenv('OC_PASS'); + $password = getenv('NC_PASS') ?: getenv('OC_PASS'); if (!$password) { - $output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>'); + $output->writeln('<error>--password-from-env given, but NC_PASS/OC_PASS is empty!</error>'); return 1; } } elseif ($input->isInteractive()) { |