Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Vault
Commits
aa6a5fa2
Commit
aa6a5fa2
authored
9 years ago
by
Jeff Mitchell
Browse files
Options
Download
Email Patches
Plain Diff
Fix potential error scoping issue.
Ping #1262
parent
61a4f4a6
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
builtin/credential/ldap/path_config.go
+3
-2
builtin/credential/ldap/path_config.go
with
3 additions
and
2 deletions
+3
-2
builtin/credential/ldap/path_config.go
+
3
-
2
View file @
aa6a5fa2
...
...
@@ -243,6 +243,7 @@ func (c *ConfigEntry) DialLDAP() (*ldap.Conn, error) {
}
var
conn
*
ldap
.
Conn
var
tlsConfig
*
tls
.
Config
switch
u
.
Scheme
{
case
"ldap"
:
if
port
==
""
{
...
...
@@ -250,7 +251,7 @@ func (c *ConfigEntry) DialLDAP() (*ldap.Conn, error) {
}
conn
,
err
=
ldap
.
Dial
(
"tcp"
,
host
+
":"
+
port
)
if
c
.
StartTLS
{
tlsConfig
,
err
:
=
c
.
GetTLSConfig
(
host
)
tlsConfig
,
err
=
c
.
GetTLSConfig
(
host
)
if
err
!=
nil
{
break
}
...
...
@@ -260,7 +261,7 @@ func (c *ConfigEntry) DialLDAP() (*ldap.Conn, error) {
if
port
==
""
{
port
=
"636"
}
tlsConfig
,
err
:
=
c
.
GetTLSConfig
(
host
)
tlsConfig
,
err
=
c
.
GetTLSConfig
(
host
)
if
err
!=
nil
{
break
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help