From 56fa3edd77d89e3538a95387afdbe6bcefe0eced Mon Sep 17 00:00:00 2001 From: csoler Date: Wed, 23 Oct 2019 08:51:22 +0000 Subject: [PATCH] further fixes to retroshare_service --- retroshare-service/src/retroshare-service.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/retroshare-service/src/retroshare-service.cc b/retroshare-service/src/retroshare-service.cc index 8013e6ee9..601878a40 100644 --- a/retroshare-service/src/retroshare-service.cc +++ b/retroshare-service/src/retroshare-service.cc @@ -179,8 +179,7 @@ int main(int argc, char* argv[]) as >> help( 'h', "help", "Display this Help" ); as.defaultErrorHandling(true, true); -#if defined(RS_JSONAPI) && defined(RS_WEBUI) \ - && defined(RS_SERVICE_TERMINAL_WEBUI_PASSWORD) +#if (defined(RS_JSONAPI) || defined(RS_WEBUI)) && defined(RS_SERVICE_TERMINAL_WEBUI_PASSWORD) std::string webui_pass1 = "Y"; if(askWebUiPassword) { @@ -301,8 +300,7 @@ int main(int argc, char* argv[]) } #endif // def RS_SERVICE_TERMINAL_LOGIN -#if defined(RS_JSONAPI) && defined(RS_WEBUI) \ - && defined(RS_SERVICE_TERMINAL_WEBUI_PASSWORD) +#if (defined(RS_JSONAPI) || defined(RS_WEBUI)) && defined(RS_SERVICE_TERMINAL_WEBUI_PASSWORD) if(jsonApiServer && !webui_pass1.empty()) jsonApiServer->authorizeToken("webui:"+webui_pass1); #endif /* defined(RS_JSONAPI) && defined(RS_WEBUI) \