fix -datadir=./subdir relative path,

autostart off by default except on windows,
fix occasional "vector iterator not dereferencable" assertion with msvc,
fix readlink compile warning on linux build,
use sys/param.h and BSD define instead of __BSD__,
-paytxfee switch

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@130 1a98c847-1fd6-4fd8-948a-caf3550aa51b

1 files changed, 2 insertions, 2 deletions

diff --git a/rpc.cpp b/rpc.cpp
index 0fef539881..d03a7ce767 100644
--- a/rpc.cpp
+++ b/rpc.cpp
@@ -974,8 +974,8 @@ void ThreadRPCServer2(void* parg)
                 printf("ThreadRPCServer method=%s\n", strMethod.c_str());

 

                 // Observe lockdown

-                if (IsLockdown() && strMethod != "help" && strMethod != "stop" && strMethod != "getgenerate" && strMethod != "setgenerate")

-                    throw runtime_error("WARNING: Displayed transactions may not be correct!  You may need to upgrade.");

+                if (IsLockdown() && !mapArgs.count("-overridesafety") && strMethod != "help" && strMethod != "stop" && strMethod != "getgenerate" && strMethod != "setgenerate")

+                    throw runtime_error("WARNING: Displayed transactions may not be correct!  You may need to upgrade, or other nodes may need to upgrade.");

 

                 // Execute

                 map<string, rpcfn_type>::iterator mi = mapCallTable.find(strMethod);