Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12041 from spzala/automated-cherry-pick-of-#11795-upstream-release-3.4

Browse Source 
Automated cherry pick of #11795
This commit is contained in:
Gyuho Lee
2020-06-21 19:20:26 -07:00
committed by GitHub
parent 368ff75a10 6f011ce524
commit c8b3c6f54c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
auth/store.go
View File

@@ -59,6 +59,7 @@ var (
ErrRoleNotFound = errors.New("auth: role not found")
ErrRoleEmpty = errors.New("auth: role name is empty")
ErrAuthFailed = errors.New("auth: authentication failed, invalid user ID or password")
ErrNoPasswordUser = errors.New("auth: authentication failed, password was given for no password user")
ErrPermissionDenied = errors.New("auth: permission denied")
ErrRoleNotGranted = errors.New("auth: role is not granted to the user")
ErrPermissionNotGranted = errors.New("auth: permission is not granted to the role")
@@ -360,7 +361,7 @@ func (as *authStore) CheckPassword(username, password string) (uint64, error) {
}
if user.Options != nil && user.Options.NoPassword {
return 0, ErrAuthFailed
return 0, ErrNoPasswordUser
}
return getRevision(tx), nil