diff --git a/services/idp/pkg/service/v0/service.go b/services/idp/pkg/service/v0/service.go index cdff0120e..7aabdad7f 100644 --- a/services/idp/pkg/service/v0/service.go +++ b/services/idp/pkg/service/v0/service.go @@ -189,18 +189,18 @@ func initLicoInternalLDAPEnvVars(ldap *config.Ldap) error { } defaults := map[string]string{ - "OCIS_LDAP_URI": ldap.URI, - "OCIS_LDAP_BIND_DN": ldap.BindDN, - "OCIS_LDAP_BIND_PASSWORD": ldap.BindPassword, - "OCIS_LDAP_BASEDN": ldap.BaseDN, - "OCIS_LDAP_SCOPE": ldap.Scope, - "OCIS_LDAP_LOGIN_ATTRIBUTE": ldap.LoginAttribute, - "OCIS_LDAP_EMAIL_ATTRIBUTE": ldap.EmailAttribute, - "OCIS_LDAP_NAME_ATTRIBUTE": ldap.NameAttribute, - "OCIS_LDAP_UUID_ATTRIBUTE": ldap.UUIDAttribute, - "OCIS_LDAP_SUB_ATTRIBUTES": ldap.UUIDAttribute, - "OCIS_LDAP_UUID_ATTRIBUTE_TYPE": ldap.UUIDAttributeType, - "OCIS_LDAP_FILTER": filter, + "LDAP_URI": ldap.URI, + "LDAP_BINDDN": ldap.BindDN, + "LDAP_BINDPW": ldap.BindPassword, + "LDAP_BASEDN": ldap.BaseDN, + "LDAP_SCOPE": ldap.Scope, + "LDAP_LOGIN_ATTRIBUTE": ldap.LoginAttribute, + "LDAP_EMAIL_ATTRIBUTE": ldap.EmailAttribute, + "LDAP_NAME_ATTRIBUTE": ldap.NameAttribute, + "LDAP_UUID_ATTRIBUTE": ldap.UUIDAttribute, + "LDAP_SUB_ATTRIBUTES": ldap.UUIDAttribute, + "LDAP_UUID_ATTRIBUTE_TYPE": ldap.UUIDAttributeType, + "LDAP_FILTER": filter, } if ldap.TLSCACert != "" { diff --git a/vendor/github.com/libregraph/lico/bootstrap/backends/ldap/ldap.go b/vendor/github.com/libregraph/lico/bootstrap/backends/ldap/ldap.go index dff35d644..53b8e8bcb 100644 --- a/vendor/github.com/libregraph/lico/bootstrap/backends/ldap/ldap.go +++ b/vendor/github.com/libregraph/lico/bootstrap/backends/ldap/ldap.go @@ -109,8 +109,8 @@ func NewIdentityManager(bs bootstrap.Bootstrap) (identity.Manager, error) { tlsConfig, os.Getenv("OCIS_LDAP_URI"), os.Getenv("OCIS_LDAP_BIND_DN"), - os.Getenv("OCIS_LDAP_BIND_PASSWORD"), - os.Getenv("OCIS_LDAP_BASEDN"), + os.Getenv("LDAP_BIND_PASSWORD"), + os.Getenv("OCIS_LDAP_USER_BASE_DN"), os.Getenv("OCIS_LDAP_SCOPE"), os.Getenv("OCIS_LDAP_FILTER"), subMapping,