aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo Zhang <zhangbodut@gmail.com>2016-12-21 16:13:11 +0800
committer无闻 <u@gogs.io>2016-12-21 03:13:11 -0500
commit282f7fb8fa35c7c4df9e21c1a551219cce4cd6f8 (patch)
tree77be7a3e99f1ac969ff04f20d314cef96877995d
parent5034ef787c4ee8cea21d0ec996ac35159eae04ce (diff)
Fix typos (#3852)
-rw-r--r--models/login_source.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/models/login_source.go b/models/login_source.go
index 584f3f9b..0cb88240 100644
--- a/models/login_source.go
+++ b/models/login_source.go
@@ -292,8 +292,8 @@ func composeFullName(firstname, surname, username string) string {
// LoginViaLDAP queries if login/password is valid against the LDAP directory pool,
// and create a local user if success when enabled.
-func LoginViaLDAP(user *User, login, passowrd string, source *LoginSource, autoRegister bool) (*User, error) {
- username, fn, sn, mail, isAdmin, succeed := source.Cfg.(*LDAPConfig).SearchEntry(login, passowrd, source.Type == LOGIN_DLDAP)
+func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoRegister bool) (*User, error) {
+ username, fn, sn, mail, isAdmin, succeed := source.Cfg.(*LDAPConfig).SearchEntry(login, password, source.Type == LOGIN_DLDAP)
if !succeed {
// User not in LDAP, do nothing
return nil, ErrUserNotExist{0, login}
@@ -505,7 +505,7 @@ func ExternalUserLogin(user *User, login, password string, source *LoginSource,
}
// UserSignIn validates user name and password.
-func UserSignIn(username, passowrd string) (*User, error) {
+func UserSignIn(username, password string) (*User, error) {
var user *User
if strings.Contains(username, "@") {
user = &User{Email: strings.ToLower(username)}
@@ -521,7 +521,7 @@ func UserSignIn(username, passowrd string) (*User, error) {
if hasUser {
switch user.LoginType {
case LOGIN_NOTYPE, LOGIN_PLAIN:
- if user.ValidatePassword(passowrd) {
+ if user.ValidatePassword(password) {
return user, nil
}
@@ -536,7 +536,7 @@ func UserSignIn(username, passowrd string) (*User, error) {
return nil, ErrLoginSourceNotExist{user.LoginSource}
}
- return ExternalUserLogin(user, user.LoginName, passowrd, &source, false)
+ return ExternalUserLogin(user, user.LoginName, password, &source, false)
}
}
@@ -546,7 +546,7 @@ func UserSignIn(username, passowrd string) (*User, error) {
}
for _, source := range sources {
- authUser, err := ExternalUserLogin(nil, username, passowrd, source, true)
+ authUser, err := ExternalUserLogin(nil, username, password, source, true)
if err == nil {
return authUser, nil
}