From 63a15edd062098505e7b67d2381b07dbe448d7b8 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Thu, 28 Feb 2008 15:57:42 +0000 Subject: [PATCH] - Tag for 6.1.9 release, all platforms boinc_core_release_6_1_9 svn path=/trunk/boinc/; revision=14815 --- checkin_notes | 5 ++ configure.ac | 2 +- version.h | 8 +-- .../src/boinccas/CACreateBOINCAccounts.cpp | 3 + .../src/boinccas/CACreateClientAuthFile.cpp | 2 +- .../src/boinccas/CAGrantBOINCMasterRights.cpp | 62 +++++++++++++++++++ 6 files changed, 76 insertions(+), 6 deletions(-) diff --git a/checkin_notes b/checkin_notes index f369a12515..84e1cc547b 100644 --- a/checkin_notes +++ b/checkin_notes @@ -1729,3 +1729,8 @@ Charlie Feb 28 2008 clientgui/ MainDocument.cpp ViewMessages.cpp + +Rom Jan 30 2008 (HEAD) + - Tag for 6.1.9 release, all platforms + boinc_core_release_6_1_9 + diff --git a/configure.ac b/configure.ac index 7caa6352bb..553e1be49c 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl not sure exactly what the minimum version is (but 2.13 wont work) AC_PREREQ(2.57) dnl Set the BOINC version here. You can also use the set-version script. -AC_INIT(BOINC, 6.1.8) +AC_INIT(BOINC, 6.1.9) AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], diff --git a/version.h b/version.h index 4b87c05c41..8836b29bf9 100644 --- a/version.h +++ b/version.h @@ -10,10 +10,10 @@ #define BOINC_MINOR_VERSION 1 /* Release part of BOINC version number */ -#define BOINC_RELEASE 8 +#define BOINC_RELEASE 9 /* String representation of BOINC version number */ -#define BOINC_VERSION_STRING "6.1.8" +#define BOINC_VERSION_STRING "6.1.9" #if (defined(_WIN32) || defined(__APPLE__)) /* Name of package */ @@ -26,13 +26,13 @@ #define PACKAGE_NAME "BOINC" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "BOINC 6.1.8" +#define PACKAGE_STRING "BOINC 6.1.9" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "boinc" /* Define to the version of this package. */ -#define PACKAGE_VERSION "6.1.8" +#define PACKAGE_VERSION "6.1.9" #endif /* #if (defined(_WIN32) || defined(__APPLE__)) */ diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CACreateBOINCAccounts.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CACreateBOINCAccounts.cpp index 2684e5267b..e60d86cb4b 100644 --- a/win_build/installerv2/redist/Windows/src/boinccas/CACreateBOINCAccounts.cpp +++ b/win_build/installerv2/redist/Windows/src/boinccas/CACreateBOINCAccounts.cpp @@ -246,6 +246,8 @@ UINT CACreateBOINCAccounts::OnExecution() ); return ERROR_INSTALL_FAILURE; } + + SetProperty( _T("BOINC_MASTER_CREATED"), _T("1") ); } if(pSid != NULL) { HeapFree(GetProcessHeap(), 0, pSid); @@ -403,6 +405,7 @@ UINT CACreateBOINCAccounts::OnExecution() return ERROR_INSTALL_FAILURE; } + SetProperty( _T("BOINC_PROJECT_CREATED"), _T("1") ); } if(pSid != NULL) { HeapFree(GetProcessHeap(), 0, pSid); diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CACreateClientAuthFile.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CACreateClientAuthFile.cpp index 3da3f2a491..dd681fa7ef 100644 --- a/win_build/installerv2/redist/Windows/src/boinccas/CACreateClientAuthFile.cpp +++ b/win_build/installerv2/redist/Windows/src/boinccas/CACreateClientAuthFile.cpp @@ -77,7 +77,7 @@ UINT CACreateClientAuthFile::OnExecution() uiReturnValue = GetProperty( _T("ENABLEPROTECTEDAPPLICATIONEXECUTION"), strEnableProtectedApplicationExecution ); if ( uiReturnValue ) return uiReturnValue; - uiReturnValue = GetProperty( _T("BOINC_PROJECT_USERNAME"), strBOINCProjectAccountUsername ); + uiReturnValue = GetProperty( _T("BOINC_PROJECT_ISUSERNAME"), strBOINCProjectAccountUsername ); if ( uiReturnValue ) return uiReturnValue; uiReturnValue = GetProperty( _T("BOINC_PROJECT_PASSWORD"), strBOINCProjectAccountPassword ); diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCMasterRights.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCMasterRights.cpp index 8444e0f3da..ceec4ad7b4 100644 --- a/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCMasterRights.cpp +++ b/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCMasterRights.cpp @@ -157,6 +157,68 @@ UINT CAGrantBOINCMasterRights::OnExecution() return ERROR_INSTALL_FAILURE; } + // + // Grant the SeAssignPrimaryTokenPrivilege to users represented by pSid. + // + Status = SetPrivilegeOnAccount( + PolicyHandle, // policy handle + pSid, // SID to grant privilege + L"SeAssignPrimaryTokenPrivilege", // Unicode privilege + TRUE // enable the privilege + ); + + if(Status != STATUS_SUCCESS) + { + LogMessage( + INSTALLMESSAGE_INFO, + NULL, + NULL, + NULL, + Status, + _T("SetPrivilegeOnAccount failed.") + ); + LogMessage( + INSTALLMESSAGE_ERROR, + NULL, + NULL, + NULL, + NULL, + _T("Failed call to SetPrivilegeOnAccount - SeAssignPrimaryTokenPrivilege") + ); + return ERROR_INSTALL_FAILURE; + } + + // + // Grant the SeIncreaseQuotaPrivilege to users represented by pSid. + // + Status = SetPrivilegeOnAccount( + PolicyHandle, // policy handle + pSid, // SID to grant privilege + L"SeIncreaseQuotaPrivilege", // Unicode privilege + TRUE // enable the privilege + ); + + if(Status != STATUS_SUCCESS) + { + LogMessage( + INSTALLMESSAGE_INFO, + NULL, + NULL, + NULL, + Status, + _T("SetPrivilegeOnAccount failed.") + ); + LogMessage( + INSTALLMESSAGE_ERROR, + NULL, + NULL, + NULL, + NULL, + _T("Failed call to SetPrivilegeOnAccount - SeIncreaseQuotaPrivilege") + ); + return ERROR_INSTALL_FAILURE; + } + // // Grant the SeDenyInteractiveLogonRight to users represented by pSid. //