Browse Source

#1635 PAM return error bug

pull/1636/merge
Unknwon 9 years ago
parent
commit
d600530c20
  1. 2
      gogs.go
  2. 2
      models/login.go
  3. 2
      templates/.VERSION

2
gogs.go

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
const APP_VER = "0.6.12.0913 Beta"
const APP_VER = "0.6.12.0914 Beta"
func init() {
runtime.GOMAXPROCS(runtime.NumCPU())

2
models/login.go

@ -388,7 +388,7 @@ func LoginUserSMTPSource(u *User, name, passwd string, sourceId int64, cfg *SMTP
func LoginUserPAMSource(u *User, name, passwd string, sourceId int64, cfg *PAMConfig, autoRegister bool) (*User, error) {
if err := pam.PAMAuth(cfg.ServiceName, name, passwd); err != nil {
if strings.Contains(err.Error(), "Authentication failure") {
return nil, ErrUserNotExist{u.Id, u.Name}
return nil, ErrUserNotExist{0, name}
}
return nil, err
}

2
templates/.VERSION

@ -1 +1 @@
0.6.12.0913 Beta
0.6.12.0914 Beta
Loading…
Cancel
Save