Merge pull request #11415 from YoyinZyc/automated-cherry-pick-of-#114…

…13-upstream-release-3.4 Automated cherry pick of #11413 to release-3.4
etcd-io · Dec 2, 2019 · ac63c2f · ac63c2f
2 parents 94e46ba + ae5bd3c
commit ac63c2f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/auth/store.go b/auth/store.go
@@ -306,7 +306,7 @@ func (as *authStore) Authenticate(ctx context.Context, username, password string
 		return nil, ErrAuthFailed
 	}
 
-	if user.Options.NoPassword {
+	if user.Options != nil && user.Options.NoPassword {
 		return nil, ErrAuthFailed
 	}
 
@@ -344,7 +344,7 @@ func (as *authStore) CheckPassword(username, password string) (uint64, error) {
 		return 0, ErrAuthFailed
 	}
 
-	if user.Options.NoPassword {
+	if user.Options != nil && user.Options.NoPassword {
 		return 0, ErrAuthFailed
 	}