From aeccbc975fded4294c4e7cf4c261140a79de67ae Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 17 Aug 2011 17:46:50 +0000
Subject: [PATCH] privkeyfile tweak
---
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java | 5 ++++-
router/java/src/net/i2p/router/RouterVersion.java | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
index 385bddb7a0..10f80aa157 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
@@ -875,7 +875,10 @@ public class IndexBean {
return "Tunnel must be stopped before modifying destination";
}
- PrivateKeyFile pkf = new PrivateKeyFile(new File(_context.getProperty("i2p.dir.config"), _privKeyFile));
+ File keyFile = new File(_privKeyFile);
+ if (!keyFile.isAbsolute())
+ keyFile = new File(_context.getConfigDir(), _privKeyFile);
+ PrivateKeyFile pkf = new PrivateKeyFile(keyFile);
try {
pkf.createIfAbsent();
} catch (Exception e) {
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f5c9264549..601535dbe6 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,10 +18,10 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
- public final static long BUILD = 20;
+ public final static long BUILD = 21;
/** for example "-test" */
- public final static String EXTRA = "";
+ public final static String EXTRA = "-rc";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
public static void main(String args[]) {
System.out.println("I2P Router version: " + FULL_VERSION);
--
GitLab