Skip to content

Commit 4505a8c

Browse files
sirainenfleischie
authored andcommitted
Rename passdb_mechanisms to passdb_mechamisms_filter and "none" value to "lookup"
1 parent 9e912c8 commit 4505a8c

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
@@ -9111,23 +9111,23 @@ The scheme that passwords are in the passdb, unless overridden by the passdb
91119111
entry (typically by prefixing with \`{SCHEME}\`).`
91129112
},
91139113

9114-
passdb_mechanisms: {
9114+
passdb_mechanisms_filter: {
91159115
tags: [ 'passdb' ],
91169116
added: {
9117-
settings_passdb_mechanisms_added: false,
9117+
settings_passdb_mechanisms_filter_added: false,
91189118
},
91199119
values: setting_types.BOOLLIST,
91209120
text: `
91219121
Skip the passdb if non-empty and the current auth mechanism is not listed here.
9122-
If the value contains \`none\`, it matches for non-authenticating passdb
9122+
If the value contains \`lookup\`, it matches for non-authenticating passdb
91239123
lookups (e.g. lmtp/doveadm lookups).
91249124
91259125
Example:
91269126
91279127
\`\`\`[dovecot.conf]
91289128
passdb passwd-file {
91299129
driver = passwd-file
9130-
mechanisms = PLAIN LOGIN
9130+
mechanisms_filter = PLAIN LOGIN
91319131
# ...
91329132
}
91339133
\`\`\``

data/updates.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ export const updates = {
140140
settings_mail_lua_added: '2.4.0',
141141
settings_mailbox_special_use_changed: '2.4.0',
142142
settings_metric_fields_changed: '2.4.0',
143-
settings_passdb_mechanisms_added: '2.2.30',
143+
settings_passdb_mechanisms_filter_added: '2.4.0',
144144
settings_passdb_static_password_added: '2.4.0',
145145
settings_passdb_username_filter_added: '2.2.30',
146146
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)