From eefa006d7f38d39a2b8b3d880caf101e2db62d67 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 25 Sep 2006 17:40:54 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=11187 --- checkin_notes | 7 +++++++ client/main.C | 16 ++++++++++++---- doc/contact.php | 3 +-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/checkin_notes b/checkin_notes index bc3cb7fda9..6bfb2e4d39 100755 --- a/checkin_notes +++ b/checkin_notes @@ -10418,3 +10418,10 @@ Charlie 25 Sept 2006 Mac_SA_Secure.sh boinc.xcodeproj/ project.pbxproj + +David 25 Sept 2006 + - core client, Mac: if file ownership not secure, describe + -insecure option in error message + + client/ + main.C diff --git a/client/main.C b/client/main.C index c771c9fcf6..97b409c35c 100644 --- a/client/main.C +++ b/client/main.C @@ -754,16 +754,24 @@ int main(int argc, char** argv) { #else #ifdef SANDBOX - // Make sure owners, groups and permissions are correct for the current setting of g_use_sandbox + // Make sure owners, groups and permissions are correct + // for the current setting of g_use_sandbox + // #if defined(_DEBUG) && defined(__APPLE__) - // GDB can't attach to applications which are running as a diferent user - // or group, so fix up data with current user and group during debugging + // GDB can't attach to applications which are running as a diferent user + // or group, so fix up data with current user and group during debugging + // if (check_security(g_use_sandbox, false)) SetBOINCDataOwnersGroupsAndPermissions(); #endif // _DEBUG && __APPLE__ int i = check_security(g_use_sandbox, false); if (i) { - printf( "\nBOINC ownership or permissions are not set properly; please reinstall BOINC. (Error code %d)\n", i); + printf( + "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" + ); return ERR_USER_PERMISSION; } #endif // SANDBOX diff --git a/doc/contact.php b/doc/contact.php index e6af0a5dc8..538a8257f0 100644 --- a/doc/contact.php +++ b/doc/contact.php @@ -69,7 +69,6 @@ Each area is managed by an 'owner'. Translations of GUI and web text Jens Seidler - Janus Kristensen Unix build system @@ -78,7 +77,7 @@ Each area is managed by an 'owner'. Web features - Janus Kristensen + David Anderson Rob Ogilvie