diff options
| author | Unknwon <u@gogs.io> | 2015-08-16 14:31:54 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-08-16 14:31:54 +0800 |
| commit | 55ccb00a47e580efc1cf184e31dd19f05137a4b3 (patch) | |
| tree | ad538b0525a886c8f1c0549709e8b97ac8e811d0 /routers | |
| parent | 6d3e5a36a1d81cc690807768de3f686699f4c171 (diff) | |
| parent | f8a4ab25fda9731803e787160f54d767d1b57eef (diff) | |
| download | gitea-55ccb00a47e580efc1cf184e31dd19f05137a4b3.tar.gz gitea-55ccb00a47e580efc1cf184e31dd19f05137a4b3.zip | |
Merge branch 'develop' of https://github.com/SergioBenitez/gogs into develop
# Conflicts:
# modules/bindata/bindata.go
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/admin/auths.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/routers/admin/auths.go b/routers/admin/auths.go index 2bec7da46c..bb73026b7d 100644 --- a/routers/admin/auths.go +++ b/routers/admin/auths.go @@ -63,18 +63,18 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) { case models.LDAP: u = &models.LDAPConfig{ Ldapsource: ldap.Ldapsource{ + Name: form.Name, Host: form.Host, Port: form.Port, UseSSL: form.UseSSL, - BaseDN: form.BaseDN, - AttributeUsername: form.AttributeUsername, + BindDN: form.BindDN, + BindPassword: form.BindPassword, + UserBase: form.UserBase, + Filter: form.Filter, AttributeName: form.AttributeName, AttributeSurname: form.AttributeSurname, AttributeMail: form.AttributeMail, - Filter: form.Filter, - MsAdSAFormat: form.MsAdSA, Enabled: true, - Name: form.Name, }, } case models.SMTP: @@ -149,18 +149,18 @@ func EditAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) { case models.LDAP: config = &models.LDAPConfig{ Ldapsource: ldap.Ldapsource{ + Name: form.Name, Host: form.Host, Port: form.Port, UseSSL: form.UseSSL, - BaseDN: form.BaseDN, - AttributeUsername: form.AttributeUsername, + BindDN: form.BindDN, + BindPassword: form.BindPassword, + UserBase: form.UserBase, AttributeName: form.AttributeName, AttributeSurname: form.AttributeSurname, AttributeMail: form.AttributeMail, Filter: form.Filter, - MsAdSAFormat: form.MsAdSA, Enabled: true, - Name: form.Name, }, } case models.SMTP: |