From 26ac016b9fb6b3fb308996e2ee56dad0b794aa49 Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Thu, 10 Sep 2015 15:03:14 -0400
Subject: minor fix on #1581
---
models/login.go | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
(limited to 'models/login.go')
diff --git a/models/login.go b/models/login.go
index b4cb60ad..a7d07d50 100644
--- a/models/login.go
+++ b/models/login.go
@@ -23,13 +23,14 @@ import (
type LoginType int
+// Note: new type must be added at the end of list to maintain compatibility.
const (
NOTYPE LoginType = iota
PLAIN
LDAP
- DLDAP
SMTP
PAM
+ DLDAP
)
var (
@@ -107,9 +108,7 @@ func (source *LoginSource) BeforeSet(colName string, val xorm.Cell) {
switch colName {
case "type":
switch LoginType((*val).(int64)) {
- case LDAP:
- fallthrough
- case DLDAP:
+ case LDAP, DLDAP:
source.Cfg = new(LDAPConfig)
case SMTP:
source.Cfg = new(SMTPConfig)
@@ -233,9 +232,7 @@ func ExternalUserLogin(u *User, name, passwd string, source *LoginSource, autoRe
}
switch source.Type {
- case LDAP:
- fallthrough
- case DLDAP:
+ case LDAP, DLDAP:
return LoginUserLdapSource(u, name, passwd, source, autoRegister)
case SMTP:
return LoginUserSMTPSource(u, name, passwd, source.ID, source.Cfg.(*SMTPConfig), autoRegister)
--
cgit v1.2.3