fix for svn 7713

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7715 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 14 years ago
parent 7e368000c8
commit 0960261769

@ -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 {

@ -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;

@ -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));

Loading…
Cancel
Save