diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2016-09-19 15:52:48 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-09-19 16:14:18 +0200 |
| commit | faddd62518c7b81c56ea2c9936cf850878c03e0b (patch) | |
| tree | 94206c8a040ba87fcffbd95c0de311ad54e78bc9 /src/init.cpp | |
| parent | 9ac01301f5c45698a5db356da9e8dbc1500f7c31 (diff) | |
| download | bitcoin-faddd62518c7b81c56ea2c9936cf850878c03e0b.tar.xz | |
init: Get rid of some ENABLE_WALLET
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/init.cpp b/src/init.cpp index 32b1719258..455eb85920 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -759,10 +759,7 @@ void InitParameterInteraction() if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)) { if (SoftSetBoolArg("-whitelistrelay", false)) LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -whitelistrelay=0\n", __func__); -#ifdef ENABLE_WALLET - if (SoftSetBoolArg("-walletbroadcast", false)) - LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__); -#endif + // walletbroadcast is disabled in CWallet::ParameterInteraction() } // Forcing relay from whitelisted hosts implies we will accept relays from them in the first place. @@ -821,12 +818,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) return InitError("Initializing networking failed"); #ifndef WIN32 - if (GetBoolArg("-sysperms", false)) { -#ifdef ENABLE_WALLET - if (!GetBoolArg("-disablewallet", false)) - return InitError("-sysperms is not allowed in combination with enabled wallet functionality"); -#endif - } else { + if (!GetBoolArg("-sysperms", false)) { umask(077); } @@ -854,15 +846,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) // also see: InitParameterInteraction() - // if using block pruning, then disable txindex + // if using block pruning, then disallow txindex if (GetArg("-prune", 0)) { if (GetBoolArg("-txindex", DEFAULT_TXINDEX)) return InitError(_("Prune mode is incompatible with -txindex.")); -#ifdef ENABLE_WALLET - if (GetBoolArg("-rescan", false)) { - return InitError(_("Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.")); - } -#endif } // Make sure enough file descriptors are available |