Skip to content

fix: use correct ServerName for StartTLS #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harshavardhana merged 1 commit into from
Nov 15, 2025
Merged

fix: use correct ServerName for StartTLS #195

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion ldap/ldap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,18 @@ func (l *Config) connect(ldapAddr string) (ldapConn *ldap.Conn, err error) {
if ldapConn != nil {
ldapConn.SetTimeout(30 * time.Second) // Change default timeout to 30 seconds.
if l.ServerStartTLS {
err = ldapConn.StartTLS(l.TLS)
// we need to fix up the ServerName in the TLS config to match the
// host name to which we are actually connecting - this may be
// different from the originally configured host name if this
// ldapAddr was derived from an SRV lookup
var host string
host, _, err = net.SplitHostPort(ldapAddr)
if err != nil {
return nil, err
}
tlsConfig := l.TLS.Clone()
tlsConfig.ServerName = host
err = ldapConn.StartTLS(tlsConfig)
}
}

Expand Down
Loading