Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

config-rewrite: auth: Rename passdb_mechanisms to passdb_mechanisms_filter #1029

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions data/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -9098,23 +9098,23 @@ The scheme that passwords are in the passdb, unless overridden by the passdb
entry (typically by prefixing with \`{SCHEME}\`).`
},

passdb_mechanisms: {
passdb_mechanisms_filter: {
tags: [ 'passdb' ],
added: {
settings_passdb_mechanisms_added: false,
settings_passdb_mechanisms_filter_added: false,
},
values: setting_types.BOOLLIST,
text: `
Skip the passdb if non-empty and the current auth mechanism is not listed here.
If the value contains \`none\`, it matches for non-authenticating passdb
If the value contains \`lookup\`, it matches for non-authenticating passdb
lookups (e.g. lmtp/doveadm lookups).

Example:

\`\`\`[dovecot.conf]
passdb passwd-file {
driver = passwd-file
mechanisms = PLAIN LOGIN
mechanisms_filter = PLAIN LOGIN
# ...
}
\`\`\``
Expand Down
2 changes: 1 addition & 1 deletion data/updates.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export const updates = {
settings_mail_lua_added: '2.4.0',
settings_mailbox_special_use_changed: '2.4.0',
settings_metric_fields_changed: '2.4.0',
settings_passdb_mechanisms_added: '2.2.30',
settings_passdb_mechanisms_filter_added: '2.4.0',
settings_passdb_static_password_added: '2.4.0',
settings_passdb_username_filter_added: '2.2.30',
settings_service_idle_kill_changed: '2.3.21',
Expand Down
2 changes: 1 addition & 1 deletion docs/core/config/auth/databases/oauth2.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ oauth2 {
}

passdb oauth2 {
mechanisms = plain login
mechanisms_filter = plain login
oauth2 {
# inherit common oauth2 settings from the global scope
grant_url = http://localhost:8000/token
Expand Down
1 change: 0 additions & 1 deletion docs/core/config/auth/mechanisms/kerberos.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ ticket-based authentication, you will need something like:
```[dovecot.conf]
auth_mechanisms = plain login gssapi
auth_gssapi_hostname = "$ALL"
auth_mechanisms = gssapi
auth_krb5_keytab = /etc/dovecot/dovecot.keytab

passdb pam {
Expand Down
Loading