You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2013/03/18 16:39:03 UTC
svn commit: r1457820 - in /accumulo/trunk: ./ server/
server/src/main/java/org/apache/accumulo/server/util/Initialize.java
Author: vines
Date: Mon Mar 18 15:39:02 2013
New Revision: 1457820
URL: http://svn.apache.org/r1457820
Log:
ACCUMULO-1184 - simple fix for reset security bug
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1457190-1457723,1457725-1457818
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1457190-1457723,1457725-1457818
Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Initialize.java?rev=1457820&r1=1457819&r2=1457820&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Initialize.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Initialize.java Mon Mar 18 15:39:02 2013
@@ -492,16 +492,14 @@ public class Initialize {
public static void main(String[] args) {
Opts opts = new Opts();
opts.parseArgs(Initialize.class.getName(), args);
-
- boolean justSecurity = false;
-
+
try {
SecurityUtil.serverLogin();
Configuration conf = CachedConfiguration.getInstance();
FileSystem fs = FileUtil.getFileSystem(conf, ServerConfiguration.getSiteConfiguration());
- if (justSecurity) {
+ if (opts.resetSecurity) {
if (isInitialized(fs)) {
opts.rootuser = getRootUser(opts);
opts.rootpass = getRootPassword(opts);