From 2bc3e83e1ce89a6c250116216a93da3a401127db Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Mon, 14 Sep 2015 12:24:37 -0400
Subject: [PATCH] fix simple LDAP userDN
---
modules/auth/ldap/ldap.go | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/modules/auth/ldap/ldap.go b/modules/auth/ldap/ldap.go
index 61cfca90b5..3e6f9731c1 100644
--- a/modules/auth/ldap/ldap.go
+++ b/modules/auth/ldap/ldap.go
@@ -82,8 +82,8 @@ func (ls Ldapsource) FindUserDN(name string) (string, bool) {
func (ls Ldapsource) SearchEntry(name, passwd string, directBind bool) (string, string, string, bool, bool) {
var userDN string
if directBind {
- log.Trace("LDAP will bind directly via UserDN template: %s", ls.UserDN)
- userDN = fmt.Sprintf(ls.UserDN, name)
+ log.Trace("LDAP will bind directly via UserDN: %s", ls.UserDN)
+ userDN = ls.UserDN
} else {
log.Trace("LDAP will use BindDN.")
@@ -100,7 +100,6 @@ func (ls Ldapsource) SearchEntry(name, passwd string, directBind bool) (string,
ls.Enabled = false
return "", "", "", false, false
}
-
defer l.Close()
log.Trace("Binding with userDN: %s", userDN)