aboutsummaryrefslogtreecommitdiff
path: root/routers/admin/auths.go
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-12-01 18:23:12 -0500
committerUnknwon <u@gogs.io>2015-12-01 18:23:12 -0500
commit53bf23d965a5a0d2582b4f45da2dd997f90360b7 (patch)
treeb542b8a5446bcbdd5287212c390d9eb2816290b6 /routers/admin/auths.go
parent7ccce4d1102508cf1f993bde31bf502eb142a991 (diff)
parent573305f3d3ac55a79639dcb4cc55694ad7a914a5 (diff)
Merge pull request #2079 from nanoant/patch/ldap-custom-username-attr
LDAP: Optional user name attribute specification
Diffstat (limited to 'routers/admin/auths.go')
-rw-r--r--routers/admin/auths.go31
1 files changed, 16 insertions, 15 deletions
diff --git a/routers/admin/auths.go b/routers/admin/auths.go
index e264f7a8..baa5efe3 100644
--- a/routers/admin/auths.go
+++ b/routers/admin/auths.go
@@ -68,21 +68,22 @@ func NewAuthSource(ctx *middleware.Context) {
func parseLDAPConfig(form auth.AuthenticationForm) *models.LDAPConfig {
return &models.LDAPConfig{
Source: &ldap.Source{
- Name: form.Name,
- Host: form.Host,
- Port: form.Port,
- UseSSL: form.TLS,
- SkipVerify: form.SkipVerify,
- BindDN: form.BindDN,
- UserDN: form.UserDN,
- BindPassword: form.BindPassword,
- UserBase: form.UserBase,
- AttributeName: form.AttributeName,
- AttributeSurname: form.AttributeSurname,
- AttributeMail: form.AttributeMail,
- Filter: form.Filter,
- AdminFilter: form.AdminFilter,
- Enabled: true,
+ Name: form.Name,
+ Host: form.Host,
+ Port: form.Port,
+ UseSSL: form.TLS,
+ SkipVerify: form.SkipVerify,
+ BindDN: form.BindDN,
+ UserDN: form.UserDN,
+ BindPassword: form.BindPassword,
+ UserBase: form.UserBase,
+ AttributeUsername: form.AttributeUsername,
+ AttributeName: form.AttributeName,
+ AttributeSurname: form.AttributeSurname,
+ AttributeMail: form.AttributeMail,
+ Filter: form.Filter,
+ AdminFilter: form.AdminFilter,
+ Enabled: true,
},
}
}