Merge pull request #2516 from yichengq/fix-sec

security: fix var shadowing in CreateOrUpdate

etcdserver/security/security.go

@@ -197,7 +197,7 @@ func (s *Store) GetRole(name string) (Role, error) {
 }
 
 func (s *Store) CreateOrUpdateRole(role Role) (Role, error) {
-	role, err := s.GetRole(role.Role)
+	_, err := s.GetRole(role.Role)
 	if err == nil {
 		return s.UpdateRole(role)
 	}