Skip to content

fix(provisioning): show TLS modes and master user in occ list output - #13953

Merged
kesselb merged 1 commit into
mainfrom
fix/occ-prov
Oct 27, 2026
Merged

kesselb merged 1 commit into
mainfrom
fix/occ-prov

Conversation

@hamza221

@hamza221 hamza221 commented Oct 27, 2026 •

Copy link
Copy Markdown
Contributor
file-966d8894e7b79c5559f5433178f24cdc

馃 AI (if applicable)

  • The content of this PR was partly or fully generated using AI (N/A)

Signed-off-by: hamza <hamzamahjoubi221@gmail.com>
@hamza221

Copy link
Copy Markdown
Contributor Author

/backport to stable5.13

return 'no';
}
$masterUser = $provisioning->getMasterUser() ?? '';
return $masterUser === '' ? 'yes' : 'yes (user: ' . $masterUser . ')';

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return $masterUser === '' ? 'yes' : 'yes (user: ' . $masterUser . ')';
return $masterUser === '' ? 'yes' : 'yes (masteruser: ' . $masterUser . ')';

Would be better. Because it's actually a suffix. If your imap username is alice, it will then authenticated as alice*masteruser.

@kesselb
kesselb merged commit 435d27c into main Oct 27, 2026
46 checks passed
@kesselb
kesselb deleted the fix/occ-prov branch October 27, 2026 21:48
@kesselb

kesselb commented Oct 27, 2026

Copy link
Copy Markdown
Contributor

/backport to stable5.13 please

@backportbot

backportbot Bot commented Oct 27, 2026

Copy link
Copy Markdown

The backport to stable5.13 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable5.13
git pull origin stable5.13

# Create the new backport branch
git checkout -b backport/13953/stable5.13

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick cf6d5ac5

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/13953/stable5.13

Error: Failed to create pull request: Validation Failed: {"resource":"PullRequest","code":"custom","message":"A pull request already exists for nextcloud:backport/13953/stable5.13."} - https://docs.github.com/rest/pulls/pulls#create-a-pull-request


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants