Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-24 22:30:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

further fixes to retroshare_service

Browse source
This commit is contained in:
csoler 2019-10-23 08:51:22 +00:00
parent 25ea34ac68
commit 56fa3edd77
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-service/src/retroshare-service.cc
View file

@ -179,8 +179,7 @@ int main(int argc, char* argv[])
as >> help( 'h', "help", "Display this Help" ); as >> help( 'h', "help", "Display this Help" );
as.defaultErrorHandling(true, true); as.defaultErrorHandling(true, true);
#if defined(RS_JSONAPI) && defined(RS_WEBUI) \ #if (defined(RS_JSONAPI) || defined(RS_WEBUI)) && defined(RS_SERVICE_TERMINAL_WEBUI_PASSWORD)
&& defined(RS_SERVICE_TERMINAL_WEBUI_PASSWORD)
std::string webui_pass1 = "Y"; std::string webui_pass1 = "Y";
if(askWebUiPassword) if(askWebUiPassword)
{ {
@ -301,8 +300,7 @@ int main(int argc, char* argv[])
} }
#endif // def RS_SERVICE_TERMINAL_LOGIN #endif // def RS_SERVICE_TERMINAL_LOGIN
#if defined(RS_JSONAPI) && defined(RS_WEBUI) \ #if (defined(RS_JSONAPI) || defined(RS_WEBUI)) && defined(RS_SERVICE_TERMINAL_WEBUI_PASSWORD)
&& defined(RS_SERVICE_TERMINAL_WEBUI_PASSWORD)
if(jsonApiServer && !webui_pass1.empty()) if(jsonApiServer && !webui_pass1.empty())
jsonApiServer->authorizeToken("webui:"+webui_pass1); jsonApiServer->authorizeToken("webui:"+webui_pass1);
#endif /* defined(RS_JSONAPI) && defined(RS_WEBUI) \ #endif /* defined(RS_JSONAPI) && defined(RS_WEBUI) \