fix CREATE COLUMNFAMILY permissions check patch by Aleksey Yeschenko; reviewed by jbellis for CASSANDRA-4864
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a2a2251b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2a2251b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2a2251b Branch: refs/heads/trunk Commit: a2a2251b371dd7deef3ed1f0516873e894010577 Parents: 0712c66 Author: Jonathan Ellis <[email protected]> Authored: Thu Oct 25 20:11:02 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Oct 25 20:11:16 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../org/apache/cassandra/cql/QueryProcessor.java | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2a2251b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 0857259..191c935 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,6 +8,8 @@ * add a close() method to CRAR to prevent leaking file descriptors (CASSANDRA-4820) * fix potential infinite loop in get_count (CASSANDRA-4833) * fix compositeType.{get/from}String methods (CASSANDRA-4842) + * (CQL) fix CREATE COLUMNFAMILY permissions check (CASSANDRA-4864) + 1.1.6 * Wait for writes on synchronous read digest mismatch (CASSANDRA-4792) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2a2251b/src/java/org/apache/cassandra/cql/QueryProcessor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql/QueryProcessor.java b/src/java/org/apache/cassandra/cql/QueryProcessor.java index ab1c15b..149fb83 100644 --- a/src/java/org/apache/cassandra/cql/QueryProcessor.java +++ b/src/java/org/apache/cassandra/cql/QueryProcessor.java @@ -718,7 +718,7 @@ public class QueryProcessor case CREATE_COLUMNFAMILY: CreateColumnFamilyStatement createCf = (CreateColumnFamilyStatement)statement.statement; - clientState.hasColumnFamilySchemaAccess(createCf.getName(), Permission.CREATE); + clientState.hasColumnFamilySchemaAccess(keyspace, Permission.CREATE); validateSchemaAgreement(); try
