Skip to content

Commit

Permalink
users: revive USERS_LDAP_USER_SCHEMA_ID variable
Browse files Browse the repository at this point in the history
The config variable was accidently removed when cleaning up deprecated variables
for the 4.0.0 release

Fixes: owncloud#7312
  • Loading branch information
rhafer committed Sep 19, 2023
1 parent 7d8a0d5 commit 7681cb9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
7 changes: 7 additions & 0 deletions changelog/unreleased/fix-users-ldap-schema-user-id.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Bugfix: Bring back the USERS_LDAP_USER_SCHEMA_ID variable

We reintroduced the USERS_LDAP_USER_SCHEMA_ID variable which was accidently removed from the users service
with the 4.0.0 release.

https://github.com/owncloud/ocis/issues/7312
https://github.com/owncloud/ocis-charts/issues/397
2 changes: 1 addition & 1 deletion services/users/pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ type LDAPDriver struct {
}

type LDAPUserSchema struct {
ID string `yaml:"id" env:"OCIS_LDAP_USER_SCHEMA_ID" desc:"LDAP Attribute to use as the unique ID for users. This should be a stable globally unique ID like a UUID."`
ID string `yaml:"id" env:"OCIS_LDAP_USER_SCHEMA_ID;USERS_LDAP_USER_SCHEMA_ID" desc:"LDAP Attribute to use as the unique ID for users. This should be a stable globally unique ID like a UUID."`
IDIsOctetString bool `yaml:"id_is_octet_string" env:"OCIS_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING;LDAP_USER_SCHEMA_ID_IS_OCTETSTRING;USERS_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING" desc:"Set this to true if the defined 'ID' attribute for users is of the 'OCTETSTRING' syntax. This is e.g. required when using the 'objectGUID' attribute of Active Directory for the user ID's." deprecationVersion:"4.0.2" removalVersion:"5.0.0" deprecationInfo:"LDAP_USER_SCHEMA_ID_IS_OCTETSTRING changing name for consistency" deprecationReplacement:"OCIS_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING"`
Mail string `yaml:"mail" env:"OCIS_LDAP_USER_SCHEMA_MAIL;USERS_LDAP_USER_SCHEMA_MAIL" desc:"LDAP Attribute to use for the email address of users."`
DisplayName string `yaml:"display_name" env:"OCIS_LDAP_USER_SCHEMA_DISPLAYNAME;USERS_LDAP_USER_SCHEMA_DISPLAYNAME" desc:"LDAP Attribute to use for the displayname of users."`
Expand Down

0 comments on commit 7681cb9

Please sign in to comment.