Ticket #762: linuxmgr-clientstart.3.diff

client/cs_cmdline.cpp

@@ -55 +55 @@
         "    --file_xfer_giveup_period N    give up on file xfers after N sec\n"
         "    --gui_rpc_port <port>          port for GUI RPCs\n"
         "    --help                         show options\n"
+#ifdef SANDBOX
         "    --insecure                     disable app sandboxing (Unix)\n"
+#endif
         "    --launched_by_manager          client was launched by Manager\n"
         "    --master_fetch_period N        reload master URL after N RPC failures\n"
         "    --master_fetch_retry_cap N     exponential backoff limit\n"
@@ -68 +70 @@
         "    --redirectio                   redirect stdout and stderr to log files\n"
         "    --retry_cap N                  exponential backoff limit\n"
         "    --run_cpu_benchmarks           run the CPU benchmarks\n"
-#ifdef SANDBOX
-#endif
         "    --run_by_updater               set by updater\n"
         "    --saver                        client was launched by screensaver\n"
         "    --sched_retry_delay_min N      min for RPC exponential backoff\n"
@@ -205 +205 @@
             }
         } else if (ARG(no_gui_rpc)) {
             no_gui_rpc = true;
+        } else if (ARG(insecure)) {
+            //do nothing if sandbox is disabled, but always recognize the
+            //option to avoid errors
 #ifdef SANDBOX
-        } else if (ARG(insecure)) {
             g_use_sandbox = false;
 #endif
         } else if (ARG(launched_by_manager)) {

clientgui/BOINCClientManager.cpp

@@ -262 +262 @@
 
     // Append boinc.exe to the end of the strExecute string and get ready to rock
     strExecute = ::wxGetCwd() + wxT("/boinc --redirectio --launched_by_manager");
+#ifdef SANDBOX
     if (!g_use_sandbox) {
         strExecute += wxT(" --insecure");
     }
+#endif
 
     wxLogTrace(wxT("Function Status"), wxT("CMainDocument::StartupBOINCCore - szExecute '%s'\n"), strExecute.c_str());
     wxLogTrace(wxT("Function Status"), wxT("CMainDocument::StartupBOINCCore - szDataDirectory '%s'\n"), ::wxGetCwd().c_str());