Updated Branches: refs/heads/cassandra-1.1 7cbc0be23 -> e172a9b73
small fix in permission checking in ClientState, related to CASSANDRA-4490 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e172a9b7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e172a9b7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e172a9b7 Branch: refs/heads/cassandra-1.1 Commit: e172a9b735ef8f99cf45ba86c9850943829d14fb Parents: 7cbc0be Author: Pavel Yaskevich <[email protected]> Authored: Tue Sep 11 00:48:40 2012 +0300 Committer: Pavel Yaskevich <[email protected]> Committed: Tue Sep 11 00:48:40 2012 +0300 ---------------------------------------------------------------------- .../org/apache/cassandra/service/ClientState.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e172a9b7/src/java/org/apache/cassandra/service/ClientState.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/ClientState.java b/src/java/org/apache/cassandra/service/ClientState.java index 499486b..b7bf7d7 100644 --- a/src/java/org/apache/cassandra/service/ClientState.java +++ b/src/java/org/apache/cassandra/service/ClientState.java @@ -189,9 +189,9 @@ public class ClientState resourceClear(); resource.add(keyspace); - // check if keyspace access is set to Permission.ALL + // check if keyspace access is set to Permission.FULL_ACCESS // (which means that user has all access on keyspace and it's underlying elements) - if (DatabaseDescriptor.getAuthority().authorize(user, resource).contains(Permission.ALL)) + if (DatabaseDescriptor.getAuthority().authorize(user, resource).contains(Permission.FULL_ACCESS)) return; resource.add(columnFamily);
