From b3ca5f6a7e0de3d5881a8ec102fb4b4f314efb01 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Mon, 25 Sep 2006 22:32:09 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=11190 --- client/main.C | 3 ++- mac_build/Mac_SA_Insecure.sh | 4 +++- mac_build/Mac_SA_Secure.sh | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/client/main.C b/client/main.C index 97b409c35c..60aa2ec9a2 100644 --- a/client/main.C +++ b/client/main.C @@ -770,7 +770,8 @@ int main(int argc, char** argv) { "File ownership or permissions are set in a way that\n" "does not allow sandboxed execution of BOINC applications.\n" "To use BOINC anyway, use the -insecure command line option.\n" - "To change ownership/permission, reinstall BOINC.\n" + "To change ownership/permission, reinstall BOINC or run\n" + " the shell script Mac_SA_Secure.sh.\n" ); return ERR_USER_PERMISSION; } diff --git a/mac_build/Mac_SA_Insecure.sh b/mac_build/Mac_SA_Insecure.sh index 98de4b830c..ffda6fb3bc 100755 --- a/mac_build/Mac_SA_Insecure.sh +++ b/mac_build/Mac_SA_Insecure.sh @@ -93,9 +93,11 @@ chown -R ${user}:${group} . chmod -R u+rw-s,g+r-w-s,o+r-w . chmod 600 gui_rpc_auth.cfg -# AppStats application must run setuid root +if [ -f switcher/AppStats ] ; then +# AppStats application must run setuid root (used in BOINC 5.7 and later) chown root:${group} switcher/AppStats chmod 4550 switcher/AppStats +fi if [ -x /Applications/BOINCManager.app/Contents/MacOS/BOINCManager ] ; then chown ${user}:${group} /Applications/BOINCManager.app/Contents/MacOS/BOINCManager diff --git a/mac_build/Mac_SA_Secure.sh b/mac_build/Mac_SA_Secure.sh index 0b20672757..f19309ce11 100755 --- a/mac_build/Mac_SA_Secure.sh +++ b/mac_build/Mac_SA_Secure.sh @@ -188,8 +188,10 @@ if [ -d slots ] ; then update_nested_dirs slots fi -# AppStats application must run setuid root +# AppStats application must run setuid root (used in BOINC 5.7 and later) +if [ -f switcher/AppStats ] ; then set_perm switcher/AppStats root boinc_master 4550 +fi set_perm switcher/switcher boinc_project boinc_project 6551 set_perm switcher/setprojectgrp boinc_master boinc_project 2500