From b93e3dfb5544a1fb3bb70f7e7cd4a63786bc3784 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 16 Mar 2011 18:33:56 +0000 Subject: [PATCH] cleanups and permissions --- .../net/i2p/client/naming/BlockfileNamingService.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/core/java/src/net/i2p/client/naming/BlockfileNamingService.java b/core/java/src/net/i2p/client/naming/BlockfileNamingService.java index 931861ec6..963721595 100644 --- a/core/java/src/net/i2p/client/naming/BlockfileNamingService.java +++ b/core/java/src/net/i2p/client/naming/BlockfileNamingService.java @@ -31,6 +31,7 @@ import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.data.Hash; import net.i2p.util.Log; +import net.i2p.util.SecureFileOutputStream; import net.metanotion.io.Serializer; import net.metanotion.io.block.BlockFile; @@ -81,10 +82,6 @@ public class BlockfileNamingService extends DummyNamingService { private static final Serializer _destSerializer = new DestEntrySerializer(); private static final String HOSTS_DB = "hostsdb.blockfile"; - private static final String PROP_HOSTS_FILE = "i2p.hostsfilelist"; - private static final String PROP_B32 = "i2p.naming.hostsTxt.useB32"; - private static final String DEFAULT_HOSTS_FILE = - "privatehosts.txt,userhosts.txt,hosts.txt"; private static final String FALLBACK_LIST = "hosts.txt"; private static final String INFO_SKIPLIST = "%%__INFO__%%"; @@ -130,6 +127,7 @@ public class BlockfileNamingService extends DummyNamingService { // closing a BlockFile does not close the underlying file, // so we must create and retain a RAF so we may close it later raf = new RandomAccessFile(f, "rw"); + SecureFileOutputStream.setPerms(f); bf = init(raf); } catch (IOException ioe) { if (raf != null) { @@ -157,7 +155,8 @@ public class BlockfileNamingService extends DummyNamingService { Properties info = new Properties(); info.setProperty(PROP_VERSION, VERSION); info.setProperty(PROP_CREATED, Long.toString(_context.clock().now())); - String list = _context.getProperty(PROP_HOSTS_FILE, DEFAULT_HOSTS_FILE); + String list = _context.getProperty(HostsTxtNamingService.PROP_HOSTS_FILE, + HostsTxtNamingService.DEFAULT_HOSTS_FILE); info.setProperty(PROP_LISTS, list); hdr.put(PROP_INFO, info);