diff --git a/gogs.go b/gogs.go index 7d48abd2..ebe37b1d 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.6.12.0914 Beta" +const APP_VER = "0.6.12.0916 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/modules/auth/ldap/ldap.go b/modules/auth/ldap/ldap.go index 1f876905..382b5b86 100644 --- a/modules/auth/ldap/ldap.go +++ b/modules/auth/ldap/ldap.go @@ -84,8 +84,8 @@ func (ls *Source) FindUserDN(name string) (string, bool) { func (ls *Source) SearchEntry(name, passwd string, directBind bool) (string, string, string, bool, bool) { var userDN string if directBind { - log.Trace("LDAP will bind directly via UserDN: %s", ls.UserDN) - userDN = ls.UserDN + log.Trace("LDAP will bind directly via UserDN template: %s", ls.UserDN) + userDN = fmt.Sprintf(ls.UserDN, name) } else { log.Trace("LDAP will use BindDN.") diff --git a/templates/.VERSION b/templates/.VERSION index 2bbb6d74..b2b7e63f 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.6.12.0914 Beta \ No newline at end of file +0.6.12.0916 Beta \ No newline at end of file diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 1cd647cc..7423081b 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -52,7 +52,7 @@ {{if .Source.IsDLDAP}}
- +
{{end}}
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index 5b5a81ac..d342b2df 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -56,7 +56,7 @@
- +