From 096026176979a5ecd01ca515b72a3fc0a4f1748a Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Fri, 13 May 2011 15:20:57 +0000
Subject: [PATCH] fix for svn 7713

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7715 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 htroot/Settings_p.java                            | 2 +-
 source/de/anomic/search/SwitchboardConstants.java | 1 +
 source/net/yacy/migration.java                    | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/htroot/Settings_p.java b/htroot/Settings_p.java
index 08881c9a9..9288d2afd 100644
--- a/htroot/Settings_p.java
+++ b/htroot/Settings_p.java
@@ -96,7 +96,7 @@ public final class Settings_p {
         int pos;
         
         // admin password
-        if (env.getConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64MD5, "").length() == 0) {
+        if (env.getConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64, "").length() == 0) {
             // no password has been specified
             prop.put("adminuser","admin");
         } else {
diff --git a/source/de/anomic/search/SwitchboardConstants.java b/source/de/anomic/search/SwitchboardConstants.java
index 1497dcabc..a7d5c387b 100644
--- a/source/de/anomic/search/SwitchboardConstants.java
+++ b/source/de/anomic/search/SwitchboardConstants.java
@@ -42,6 +42,7 @@ public final class SwitchboardConstants {
      * by first encoding <code>username:password</code> as Base64 and hashing it using {@link MapTools#encodeMD5Hex(String)}.</p>
      */
     public static final String ADMIN_ACCOUNT_B64MD5 = "adminAccountBase64MD5";
+    public static final String ADMIN_ACCOUNT_B64    = "adminAccountBase64";
     
     public static final int   CRAWLJOB_SYNC = 0;
     public static final int   CRAWLJOB_STATUS = 1;
diff --git a/source/net/yacy/migration.java b/source/net/yacy/migration.java
index b966e03aa..44a91a553 100644
--- a/source/net/yacy/migration.java
+++ b/source/net/yacy/migration.java
@@ -215,9 +215,9 @@ public class migration {
             sb.setConfig("proxyAccountBase64MD5", Digest.encodeMD5Hex(acc));
             sb.setConfig("proxyAccountBase64", "");
         }
-        if ((acc = sb.getConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64MD5, "")).length() > 0) {
+        if ((acc = sb.getConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64, "")).length() > 0) {
             sb.setConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64MD5, Digest.encodeMD5Hex(acc));
-            sb.setConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64MD5, "");
+            sb.setConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64, "");
         }
         if ((acc = sb.getConfig("uploadAccountBase64", "")).length() > 0) {
             sb.setConfig("uploadAccountBase64MD5", Digest.encodeMD5Hex(acc));