GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-22 20:09:41 +01:00
Code Issues Projects Releases Wiki Activity

Fix compilation errors

Browse Source
This commit is contained in:
Matt Ouille 2020-02-09 01:12:42 -08:00 committed by Shivaram Lingamneni
parent d4afb027e5
commit 5ba2527eb0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
irc/accounts.go
View File

@ -834,6 +834,8 @@ func (am *AccountManager) checkLDAPPassphrase(accountName, passphrase string) (a
var ( var (
host, url string host, url string
port int port int
sr *ldap.SearchResult
l *ldap.Conn
) )
host = am.server.AccountConfig().LDAP.Servers.Host host = am.server.AccountConfig().LDAP.Servers.Host
@ -855,7 +857,7 @@ func (am *AccountManager) checkLDAPPassphrase(accountName, passphrase string) (a
url = fmt.Sprintf("ldap://%s:%d", host, port) url = fmt.Sprintf("ldap://%s:%d", host, port)
} }
l, err := ldap.DialURL(url) l, err = ldap.DialURL(url)
if err != nil { if err != nil {
return return
} }
@ -875,7 +877,7 @@ func (am *AccountManager) checkLDAPPassphrase(accountName, passphrase string) (a
for _, baseDN := range am.server.AccountConfig().LDAP.SearchBaseDNs { for _, baseDN := range am.server.AccountConfig().LDAP.SearchBaseDNs {
req := ldap.NewSearchRequest(baseDN, ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, am.server.AccountConfig().LDAP.Timeout, false, fmt.Sprintf("(&(objectClass=organizationalPerson)(uid=%s))", accountName), []string{"dn"}, nil) req := ldap.NewSearchRequest(baseDN, ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, am.server.AccountConfig().LDAP.Timeout, false, fmt.Sprintf("(&(objectClass=organizationalPerson)(uid=%s))", accountName), []string{"dn"}, nil)
sr, err := l.Search(req) sr, err = l.Search(req)
if err != nil { if err != nil {
return return
} }
@ -901,6 +903,10 @@ func (am *AccountManager) AuthenticateByPassphrase(client *Client, accountName s
if am.server.AccountConfig().LDAP.Enabled { if am.server.AccountConfig().LDAP.Enabled {
account, err = am.checkLDAPPassphrase(accountName, passphrase) account, err = am.checkLDAPPassphrase(accountName, passphrase)
if err == nil {
am.Login(client, account)
return nil
}
} }
account, err = am.checkPassphrase(accountName, passphrase) account, err = am.checkPassphrase(accountName, passphrase)