Simplify code, as per laanwj's suggestion

This commit is contained in:
Rune K. Svendsen 2014-06-08 19:58:03 +02:00
parent bd4307b84b
commit d53a33b828

View file

@ -426,16 +426,14 @@ bool AppInit2(boost::thread_group& threadGroup)
#endif #endif
#ifndef WIN32 #ifndef WIN32
if (GetBoolArg("-sysperms", false)) {
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
if (!GetBoolArg("-sysperms", false) || !GetBoolArg("-disablewallet", false)) { if (!GetBoolArg("-disablewallet", false))
umask(077);
if (GetBoolArg("-sysperms", false))
return InitError("Error: -sysperms is not allowed in combination with enabled wallet functionality"); return InitError("Error: -sysperms is not allowed in combination with enabled wallet functionality");
}
#else
if (!GetBoolArg("-sysperms", false))
umask(077);
#endif #endif
} else {
umask(077);
}
// Clean shutdown on SIGTERM // Clean shutdown on SIGTERM
struct sigaction sa; struct sigaction sa;