Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
dex
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
dex
Commits
521dbff7
Commit
521dbff7
authored
Apr 18, 2017
by
rithu leena john
Committed by
GitHub
Apr 18, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #912 from zhuguihua/fix_typo
Fix two typos
parents
5859fe10
4e99ec3e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
config.go
cmd/dex/config.go
+1
-1
ldap.go
connector/ldap/ldap.go
+1
-1
No files found.
cmd/dex/config.go
View file @
521dbff7
...
...
@@ -153,7 +153,7 @@ func (s *Storage) UnmarshalJSON(b []byte) error {
if
len
(
store
.
Config
)
!=
0
{
data
:=
[]
byte
(
os
.
ExpandEnv
(
string
(
store
.
Config
)))
if
err
:=
json
.
Unmarshal
(
data
,
storageConfig
);
err
!=
nil
{
return
fmt
.
Errorf
(
"parse stora
c
e config: %v"
,
err
)
return
fmt
.
Errorf
(
"parse stora
g
e config: %v"
,
err
)
}
}
*
s
=
Storage
{
...
...
connector/ldap/ldap.go
View file @
521dbff7
...
...
@@ -213,7 +213,7 @@ func (c *Config) openConnector(logger logrus.FieldLogger) (*ldapConnector, error
}
groupSearchScope
,
ok
:=
parseScope
(
c
.
GroupSearch
.
Scope
)
if
!
ok
{
return
nil
,
fmt
.
Errorf
(
"
user
Search.Scope unknown value %q"
,
c
.
GroupSearch
.
Scope
)
return
nil
,
fmt
.
Errorf
(
"
group
Search.Scope unknown value %q"
,
c
.
GroupSearch
.
Scope
)
}
return
&
ldapConnector
{
*
c
,
userSearchScope
,
groupSearchScope
,
tlsConfig
,
logger
},
nil
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment