From 7d84d4a8f0cb30df04241f528ed74672a485274a Mon Sep 17 00:00:00 2001
From: Sergio Benitez <sbenitez@mit.edu>
Date: Wed, 12 Aug 2015 16:58:27 -0700
Subject: Significantly enhanced LDAP support in Gogs.

---
 routers/admin/auths.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'routers')

diff --git a/routers/admin/auths.go b/routers/admin/auths.go
index 2bec7da4..bb73026b 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:
-- 
cgit v1.2.3