Skip to content

Commit 31535d6

Browse files
committed
settings: Replace generic ldap tag with specific auth-ldap and dict-ldap
Since not all settings are currently supported by dict-ldap, it's better to be explicit.
1 parent 5dd95a5 commit 31535d6

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

data/settings.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10926,7 +10926,7 @@ If enabled, ignore version mismatches between different Dovecot versions.`
1092610926
},
1092710927

1092810928
ldap_auth_dn: {
10929-
tags: [ 'ldap' ],
10929+
tags: [ 'auth-ldap', 'dict-ldap' ],
1093010930
values: setting_types.STRING,
1093110931
text: `
1093210932
Specify the Distinguished Name (the username used to login to the LDAP server).
@@ -10937,36 +10937,36 @@ Example: \`ldap_auth_dn = uid=dov-read,dc=example,dc=com,dc=.\``
1093710937
},
1093810938

1093910939
ldap_auth_dn_password: {
10940-
tags: [ 'ldap' ],
10940+
tags: [ 'auth-ldap', 'dict-ldap' ],
1094110941
values: setting_types.STRING,
1094210942
text: `
1094310943
Password for LDAP server. Used if [[setting,ldap_auth_dn]] is specified.`
1094410944
},
1094510945

1094610946
ldap_auth_sasl_authz_id: {
10947-
tags: [ 'ldap' ],
10947+
tags: [ 'auth-ldap' ],
1094810948
values: setting_types.STRING,
1094910949
text: `
1095010950
SASL authorization ID, ie. the [[setting,ldap_auth_dn_password]] is for this "master user", but the
1095110951
[[setting,ldap_auth_dn]] is still the logged in user. Normally you want to keep this empty.`
1095210952
},
1095310953

1095410954
ldap_auth_sasl_mechanisms: {
10955-
tags: [ 'ldap' ],
10955+
tags: [ 'auth-ldap' ],
1095610956
values: setting_types.BOOLLIST,
1095710957
text: `
1095810958
List of SASL mechanism names to use.`
1095910959
},
1096010960

1096110961
ldap_auth_sasl_realm: {
10962-
tags: [ 'ldap' ],
10962+
tags: [ 'auth-ldap' ],
1096310963
values: setting_types.STRING,
1096410964
text: `
1096510965
SASL realm to use.`
1096610966
},
1096710967

1096810968
ldap_base: {
10969-
tags: [ 'ldap' ],
10969+
tags: [ 'auth-ldap' ],
1097010970
values: setting_types.STRING,
1097110971
text: `
1097210972
LDAP base.
@@ -10977,7 +10977,7 @@ Example: \`ldap_base = dc=mail, dc=example, dc=org\``
1097710977
},
1097810978

1097910979
ldap_connection_group: {
10980-
tags: [ 'ldap' ],
10980+
tags: [ 'auth-ldap' ],
1098110981
values: setting_types.STRING,
1098210982
text: `
1098310983
Only databases with the same connection group share the ldap connections.
@@ -10986,7 +10986,7 @@ and as such share the connections.`
1098610986
},
1098710987

1098810988
ldap_debug_level: {
10989-
tags: [ 'ldap' ],
10989+
tags: [ 'auth-ldap', 'dict-ldap' ],
1099010990
default: '0',
1099110991
values: setting_types.UINT,
1099210992
text: `
@@ -10998,7 +10998,7 @@ You may need to recompile OpenLDAP with debugging enabled to get enough output.`
1099810998
},
1099910999

1100011000
ldap_deref: {
11001-
tags: [ 'ldap' ],
11001+
tags: [ 'auth-ldap' ],
1100211002
default: 'never',
1100311003
values: setting_types.ENUM,
1100411004
values_enum: [ 'never', 'searching', 'finding', 'always' ],
@@ -11007,7 +11007,7 @@ Specify dereference which is set as an LDAP option.`
1100711007
},
1100811008

1100911009
ldap_scope: {
11010-
tags: [ 'ldap' ],
11010+
tags: [ 'auth-ldap' ],
1101111011
default: 'subtree',
1101211012
values: setting_types.ENUM,
1101311013
values_enum: [ 'base', 'onelevel', 'subtree' ],
@@ -11017,15 +11017,15 @@ This specifies the search scope.`
1101711017

1101811018

1101911019
ldap_starttls: {
11020-
tags: [ 'ldap' ],
11020+
tags: [ 'auth-ldap', 'dict-ldap' ],
1102111021
default: 'no',
1102211022
values: setting_types.BOOLEAN,
1102311023
text: `
1102411024
Set to \`yes\` to use TLS to connect to the LDAP server.`
1102511025
},
1102611026

1102711027
ldap_uris: {
11028-
tags: [ 'ldap' ],
11028+
tags: [ 'auth-ldap', 'dict-ldap' ],
1102911029
values: setting_types.STRING,
1103011030
text: `
1103111031
LDAP URIs to use.
@@ -11039,7 +11039,7 @@ Example: \`ldap_uris = ldaps://secure.domain.org\``
1103911039
},
1104011040

1104111041
ldap_version: {
11042-
tags: [ 'ldap' ],
11042+
tags: [ 'auth-ldap' ],
1104311043
default: '3',
1104411044
values: setting_types.UINT,
1104511045
text: `

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,6 @@ returning the userdb information already in the passdb lookup.
521521

522522
## LDAP Settings
523523

524-
<SettingsComponent tag="ldap" level="2" />
525524
<SettingsComponent tag="auth-ldap" level="2" />
526525

527526
## LDAP userdb

0 commit comments

Comments
 (0)