edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 14:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

skip automatic password generation in case initialization fails

Browse source
This commit is contained in:
oy 2016-06-17 10:04:24 +02:00
parent 933159a652
commit 2ff7628d65
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/engine/server/server.cpp
View file

@ -1645,7 +1645,6 @@ void CServer::ConchainRconPasswordSet(IConsole::IResult *pResult, void *pUserDat
pfnCallback(pResult, pCallbackUserData); pfnCallback(pResult, pCallbackUserData);
if(pResult->NumArguments() >= 1) if(pResult->NumArguments() >= 1)
{ {
dbg_msg("dbg", "huh?");
static_cast<CServer *>(pUserData)->m_RconPasswordSet = 1; static_cast<CServer *>(pUserData)->m_RconPasswordSet = 1;
} }
} }
@ -1730,10 +1729,11 @@ int main(int argc, const char **argv) // ignore_convention
} }
} }
bool SkipPWGen = false;
if(secure_random_init() != 0) if(secure_random_init() != 0)
{ {
dbg_msg("secure", "could not initialize secure RNG"); dbg_msg("secure", "could not initialize secure RNG");
return -1; SkipPWGen = true; // skip automatic password generation
} }
CServer *pServer = CreateServer(); CServer *pServer = CreateServer();
@ -1792,7 +1792,8 @@ int main(int argc, const char **argv) // ignore_convention
pEngine->InitLogfile(); pEngine->InitLogfile();
pServer->InitRconPasswordIfUnset(); if(!SkipPWGen)
pServer->InitRconPasswordIfUnset();
// run the server // run the server
dbg_msg("server", "starting..."); dbg_msg("server", "starting...");