Skip to content

Commit f883226

Browse files
sirainencmouse
authored andcommitted
Rename passdb_mechanisms to passdb_mechamisms_filter and "none" value to "lookup"
1 parent e8403fd commit f883226

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

data/settings.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9099,23 +9099,23 @@ The scheme that passwords are in the passdb, unless overridden by the passdb
90999099
entry (typically by prefixing with \`{SCHEME}\`).`
91009100
},
91019101

9102-
passdb_mechanisms: {
9102+
passdb_mechanisms_filter: {
91039103
tags: [ 'passdb' ],
91049104
added: {
9105-
settings_passdb_mechanisms_added: false,
9105+
settings_passdb_mechanisms_filter_added: false,
91069106
},
91079107
values: setting_types.BOOLLIST,
91089108
text: `
91099109
Skip the passdb if non-empty and the current auth mechanism is not listed here.
9110-
If the value contains \`none\`, it matches for non-authenticating passdb
9110+
If the value contains \`lookup\`, it matches for non-authenticating passdb
91119111
lookups (e.g. lmtp/doveadm lookups).
91129112
91139113
Example:
91149114
91159115
\`\`\`[dovecot.conf]
91169116
passdb passwd-file {
91179117
driver = passwd-file
9118-
mechanisms = PLAIN LOGIN
9118+
mechanisms_filter = PLAIN LOGIN
91199119
# ...
91209120
}
91219121
\`\`\``

data/updates.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ export const updates = {
135135
settings_mail_lua_added: '2.4.0',
136136
settings_mailbox_special_use_changed: '2.4.0',
137137
settings_metric_fields_changed: '2.4.0',
138-
settings_passdb_mechanisms_added: '2.2.30',
138+
settings_passdb_mechanisms_filter_added: '2.4.0',
139139
settings_passdb_static_password_added: '2.4.0',
140140
settings_passdb_username_filter_added: '2.2.30',
141141
settings_service_idle_kill_changed: '2.3.21',

docs/core/config/auth/databases/oauth2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ oauth2 {
137137
}
138138
139139
passdb oauth2 {
140-
mechanisms = plain login
140+
mechanisms_filter = plain login
141141
oauth2 {
142142
# inherit common oauth2 settings from the global scope
143143
grant_url = http://localhost:8000/token

0 commit comments

Comments
 (0)