diff options
| author | Unknwon <u@gogs.io> | 2015-09-16 12:15:14 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-09-16 12:15:14 -0400 |
| commit | 6a1907d994c3beb7e604874d2cce3171b32b0baf (patch) | |
| tree | 464286714768b848a7f8510b9d1c20e41cccb859 | |
| parent | e303d74ab65dfeae17b815efd424bd0618a7d630 (diff) | |
| download | gitea-6a1907d994c3beb7e604874d2cce3171b32b0baf.tar.gz gitea-6a1907d994c3beb7e604874d2cce3171b32b0baf.zip | |
revert simple LDAP userDN and update example
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | modules/auth/ldap/ldap.go | 4 | ||||
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/admin/auth/edit.tmpl | 2 | ||||
| -rw-r--r-- | templates/admin/auth/new.tmpl | 2 |
5 files changed, 6 insertions, 6 deletions
@@ -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 1f87690526..382b5b8699 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 2bbb6d7403..b2b7e63fda 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 1cd647cc56..7423081bd0 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -52,7 +52,7 @@ {{if .Source.IsDLDAP}} <div class="required field"> <label for="user_dn">{{.i18n.Tr "admin.auths.user_dn"}}</label> - <input id="user_dn" name="user_dn" value="{{$cfg.UserDN}}" placeholder="e.g. ou=Users,dc=mydomain,dc=com" required> + <input id="user_dn" name="user_dn" value="{{$cfg.UserDN}}" placeholder="e.g. uid=%s,ou=Users,dc=mydomain,dc=com" required> </div> {{end}} <div class="required field"> diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index 5b5a81acc9..d342b2df17 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -56,7 +56,7 @@ </div> <div class="dldap required field {{if not (eq .type 5)}}hide{{end}}"> <label for="user_dn">{{.i18n.Tr "admin.auths.user_dn"}}</label> - <input id="user_dn" name="user_dn" value="{{.user_dn}}" placeholder="e.g. ou=Users,dc=mydomain,dc=com"> + <input id="user_dn" name="user_dn" value="{{.user_dn}}" placeholder="e.g. uid=%s,ou=Users,dc=mydomain,dc=com"> </div> <div class="required field"> <label for="filter">{{.i18n.Tr "admin.auths.filter"}}</label> |