natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-1.2' into cassandra-2.0.0 

Conflicts:
	src/java/org/apache/cassandra/config/DatabaseDescriptor.java
This commit is contained in:
Aleksey Yeschenko 2013-08-16 05:02:32 +03:00
parent a2006b6d89 ebab9d3919
commit 7e02052e3b
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java/org/apache/cassandra/auth/Auth.java
View File

@ -123,6 +123,9 @@ public class Auth
*/
public static void setup()
{
if (DatabaseDescriptor.getAuthenticator() instanceof AllowAllAuthenticator)
return;
setupAuthKeyspace();
setupUsersTable();

3
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
View File

@ -193,6 +193,9 @@ public class DatabaseDescriptor
if (conf.authorizer != null)
authorizer = FBUtilities.newAuthorizer(conf.authorizer);
if (authenticator instanceof AllowAllAuthenticator && !(authorizer instanceof AllowAllAuthorizer))
throw new ConfigurationException("AllowAllAuthenticator can't be used with " + conf.authorizer);
if (conf.internode_authenticator != null)
internodeAuthenticator = FBUtilities.construct(conf.internode_authenticator, "internode_authenticator");
else