commit
521dbff7cf
@ -153,7 +153,7 @@ func (s *Storage) UnmarshalJSON(b []byte) error {
|
|||||||
if len(store.Config) != 0 {
|
if len(store.Config) != 0 {
|
||||||
data := []byte(os.ExpandEnv(string(store.Config)))
|
data := []byte(os.ExpandEnv(string(store.Config)))
|
||||||
if err := json.Unmarshal(data, storageConfig); err != nil {
|
if err := json.Unmarshal(data, storageConfig); err != nil {
|
||||||
return fmt.Errorf("parse storace config: %v", err)
|
return fmt.Errorf("parse storage config: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*s = Storage{
|
*s = Storage{
|
||||||
|
@ -213,7 +213,7 @@ func (c *Config) openConnector(logger logrus.FieldLogger) (*ldapConnector, error
|
|||||||
}
|
}
|
||||||
groupSearchScope, ok := parseScope(c.GroupSearch.Scope)
|
groupSearchScope, ok := parseScope(c.GroupSearch.Scope)
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil, fmt.Errorf("userSearch.Scope unknown value %q", c.GroupSearch.Scope)
|
return nil, fmt.Errorf("groupSearch.Scope unknown value %q", c.GroupSearch.Scope)
|
||||||
}
|
}
|
||||||
return &ldapConnector{*c, userSearchScope, groupSearchScope, tlsConfig, logger}, nil
|
return &ldapConnector{*c, userSearchScope, groupSearchScope, tlsConfig, logger}, nil
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user