From 288c0df9971c9d73ef1764fd6904275f6d237ae6 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Thu, 3 Jul 2008 18:37:20 +0000 Subject: [PATCH] - WINSETUP: Change the custom action descriptions for those custom actions that deal with user rights and privileges and user accounts. - WINSETUP: Add some basic benchmarking code for user rights and privileges win_build/installerv2/redist/Windows/src/boinccas/ CACreateBOINCAccounts.cpp CACreateBOINCGroups.cpp CAGrantBOINCAdminsRights.cpp CAGrantBOINCMasterRights.cpp CAGrantBOINCProjectRights.cpp CAGrantBOINCProjectsRights.cpp CAGrantBOINCUsersRights.cpp CAMigrateBOINCData.cpp svn path=/trunk/boinc/; revision=15546 --- checkin_notes | 17 +++ .../src/boinccas/CACreateBOINCAccounts.cpp | 2 +- .../src/boinccas/CACreateBOINCGroups.cpp | 2 +- .../src/boinccas/CAGrantBOINCAdminsRights.cpp | 135 +++++++++++++++--- .../src/boinccas/CAGrantBOINCMasterRights.cpp | 2 +- .../boinccas/CAGrantBOINCProjectRights.cpp | 2 +- .../boinccas/CAGrantBOINCProjectsRights.cpp | 2 +- .../src/boinccas/CAGrantBOINCUsersRights.cpp | 2 +- .../src/boinccas/CAMigrateBOINCData.cpp | 4 + 9 files changed, 146 insertions(+), 22 deletions(-) diff --git a/checkin_notes b/checkin_notes index 9e08c00bed..4c391bb2e6 100644 --- a/checkin_notes +++ b/checkin_notes @@ -5425,3 +5425,20 @@ David 2 July 2008 sched/ server_types.C + +Rom 3 July 2008 + - WINSETUP: Change the custom action descriptions for those custom + actions that deal with user rights and privileges and user + accounts. + - WINSETUP: Add some basic benchmarking code for user rights and + privileges + + win_build/installerv2/redist/Windows/src/boinccas/ + CACreateBOINCAccounts.cpp + CACreateBOINCGroups.cpp + CAGrantBOINCAdminsRights.cpp + CAGrantBOINCMasterRights.cpp + CAGrantBOINCProjectRights.cpp + CAGrantBOINCProjectsRights.cpp + CAGrantBOINCUsersRights.cpp + CAMigrateBOINCData.cpp diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CACreateBOINCAccounts.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CACreateBOINCAccounts.cpp index ddfc887af8..42a32012e0 100644 --- a/win_build/installerv2/redist/Windows/src/boinccas/CACreateBOINCAccounts.cpp +++ b/win_build/installerv2/redist/Windows/src/boinccas/CACreateBOINCAccounts.cpp @@ -26,7 +26,7 @@ #define CUSTOMACTION_NAME _T("CACreateBOINCAccounts") -#define CUSTOMACTION_PROGRESSTITLE _T("Create user accounts used by BOINC for secure sandboxes") +#define CUSTOMACTION_PROGRESSTITLE _T("Validating user accounts used by BOINC for secure sandboxes") ///////////////////////////////////////////////////////////////////// diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CACreateBOINCGroups.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CACreateBOINCGroups.cpp index 6b4aa4a54f..869972a450 100644 --- a/win_build/installerv2/redist/Windows/src/boinccas/CACreateBOINCGroups.cpp +++ b/win_build/installerv2/redist/Windows/src/boinccas/CACreateBOINCGroups.cpp @@ -25,7 +25,7 @@ #define CUSTOMACTION_NAME _T("CACreateBOINCGroups") -#define CUSTOMACTION_PROGRESSTITLE _T("Create user groups used by BOINC for secure sandboxes") +#define CUSTOMACTION_PROGRESSTITLE _T("Validating user groups used by BOINC for secure sandboxes") ///////////////////////////////////////////////////////////////////// diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCAdminsRights.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCAdminsRights.cpp index f7f64abd75..0332e92cee 100644 --- a/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCAdminsRights.cpp +++ b/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCAdminsRights.cpp @@ -25,7 +25,7 @@ #define CUSTOMACTION_NAME _T("CAGrantBOINCAdminsRights") -#define CUSTOMACTION_PROGRESSTITLE _T("Granting the BOINC Administrators required privileges") +#define CUSTOMACTION_PROGRESSTITLE _T("Validating the BOINC Administrators group privilege levels") ///////////////////////////////////////////////////////////////////// @@ -88,21 +88,56 @@ UINT CAGrantBOINCAdminsRights::OnExecution() // most cases. // User Rights + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeNetworkLogonRight' right.")); GrantUserRight(pSid, L"SeNetworkLogonRight", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeRemoteInteractiveLogonRight' right.")); GrantUserRight(pSid, L"SeRemoteInteractiveLogonRight", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeBatchLogonRight' right.")); GrantUserRight(pSid, L"SeBatchLogonRight", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeInteractiveLogonRight' right.")); GrantUserRight(pSid, L"SeInteractiveLogonRight", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeServiceLogonRight' right.")); GrantUserRight(pSid, L"SeServiceLogonRight", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeDenyNetworkLogonRight' right.")); GrantUserRight(pSid, L"SeDenyNetworkLogonRight", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeDenyInteractiveLogonRight' right.")); GrantUserRight(pSid, L"SeDenyInteractiveLogonRight", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeDenyBatchLogonRight' right.")); GrantUserRight(pSid, L"SeDenyBatchLogonRight", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeDenyServiceLogonRight' right.")); GrantUserRight(pSid, L"SeDenyServiceLogonRight", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeDenyRemoteInteractiveLogonRight' right.")); GrantUserRight(pSid, L"SeDenyRemoteInteractiveLogonRight", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); // Privileges + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeTcbPrivilege' right.")); GrantUserRight(pSid, L"SeTcbPrivilege", FALSE); - GrantUserRight(pSid, L"SeMachineAccountPrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeMachineAccountPrivilege' right.")); + GrantUserRight(pSid, L"SeMachineAccountPrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeIncreaseQuotaPrivilege' right.")); if (!GrantUserRight(pSid, L"SeIncreaseQuotaPrivilege", TRUE)) { LogMessage( @@ -114,9 +149,13 @@ UINT CAGrantBOINCAdminsRights::OnExecution() _T("Failed call to GrantUserRight - SeIncreaseQuotaPrivilege") ); } + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeBackupPrivilege' right.")); GrantUserRight(pSid, L"SeBackupPrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeChangeNotifyPrivilege' right.")); if (!GrantUserRight(pSid, L"SeChangeNotifyPrivilege", TRUE)) { LogMessage( @@ -128,11 +167,21 @@ UINT CAGrantBOINCAdminsRights::OnExecution() _T("Failed call to GrantUserRight - SeChangeNotifyPrivilege") ); } + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeSystemTimePrivilege' right.")); GrantUserRight(pSid, L"SeSystemTimePrivilege", FALSE); - GrantUserRight(pSid, L"SeCreateTokenPrivilege", FALSE); - GrantUserRight(pSid, L"SeCreatePagefilePrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeCreateTokenPrivilege' right.")); + GrantUserRight(pSid, L"SeCreateTokenPrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeCreatePagefilePrivilege' right.")); + GrantUserRight(pSid, L"SeCreatePagefilePrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeCreateGlobalPrivilege' right.")); if (!GrantUserRight(pSid, L"SeCreateGlobalPrivilege", TRUE)) { LogMessage( @@ -144,7 +193,9 @@ UINT CAGrantBOINCAdminsRights::OnExecution() _T("Failed call to GrantUserRight - SeCreateGlobalPrivilege") ); } + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeDebugPrivilege' right.")); if (!GrantUserRight(pSid, L"SeDebugPrivilege", TRUE)) { LogMessage( @@ -156,21 +207,61 @@ UINT CAGrantBOINCAdminsRights::OnExecution() _T("Failed call to GrantUserRight - SeDebugPrivilege") ); } + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeEnableDelegationPrivilege' right.")); GrantUserRight(pSid, L"SeEnableDelegationPrivilege", FALSE); - GrantUserRight(pSid, L"SeRemoteShutdownPrivilege", FALSE); - GrantUserRight(pSid, L"SeAuditPrivilege", FALSE); - GrantUserRight(pSid, L"SeImpersonatePrivilege", FALSE); - GrantUserRight(pSid, L"SeIncreaseBasePriorityPrivilege", FALSE); - GrantUserRight(pSid, L"SeLoadDriverPrivilege", FALSE); - GrantUserRight(pSid, L"SeLockMemoryPrivilege", FALSE); - GrantUserRight(pSid, L"SeSecurityPrivilege", FALSE); - GrantUserRight(pSid, L"SeSystemEnvironmentPrivilege", FALSE); - GrantUserRight(pSid, L"SeManageVolumePrivilege", FALSE); - GrantUserRight(pSid, L"SeProfileSingleProcessPrivilege", FALSE); - GrantUserRight(pSid, L"SeSystemProfilePrivilege", FALSE); - GrantUserRight(pSid, L"SeUndockPrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeRemoteShutdownPrivilege' right.")); + GrantUserRight(pSid, L"SeRemoteShutdownPrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeAuditPrivilege' right.")); + GrantUserRight(pSid, L"SeAuditPrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeImpersonatePrivilege' right.")); + GrantUserRight(pSid, L"SeImpersonatePrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeIncreaseBasePriorityPrivilege' right.")); + GrantUserRight(pSid, L"SeIncreaseBasePriorityPrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeLoadDriverPrivilege' right.")); + GrantUserRight(pSid, L"SeLoadDriverPrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeLockMemoryPrivilege' right.")); + GrantUserRight(pSid, L"SeLockMemoryPrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeSecurityPrivilege' right.")); + GrantUserRight(pSid, L"SeSecurityPrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeSystemEnvironmentPrivilege' right.")); + GrantUserRight(pSid, L"SeSystemEnvironmentPrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeManageVolumePrivilege' right.")); + GrantUserRight(pSid, L"SeManageVolumePrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeProfileSingleProcessPrivilege' right.")); + GrantUserRight(pSid, L"SeProfileSingleProcessPrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeSystemProfilePrivilege' right.")); + GrantUserRight(pSid, L"SeSystemProfilePrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeUndockPrivilege' right.")); + GrantUserRight(pSid, L"SeUndockPrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeAssignPrimaryTokenPrivilege' right.")); if (!GrantUserRight(pSid, L"SeAssignPrimaryTokenPrivilege", TRUE)) { LogMessage( @@ -182,11 +273,23 @@ UINT CAGrantBOINCAdminsRights::OnExecution() _T("Failed call to GrantUserRight - SeAssignPrimaryTokenPrivilege") ); } + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeRestorePrivilege' right.")); GrantUserRight(pSid, L"SeRestorePrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeShutdownPrivilege' right.")); GrantUserRight(pSid, L"SeShutdownPrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeSynchAgentPrivilege' right.")); GrantUserRight(pSid, L"SeSynchAgentPrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); + + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Checking the 'SeTakeOwnershipPrivilege' right.")); GrantUserRight(pSid, L"SeTakeOwnershipPrivilege", FALSE); + LogMessage(INSTALLMESSAGE_INFO, NULL, NULL, NULL, NULL, _T("Check completed.")); } else diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCMasterRights.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCMasterRights.cpp index 7672c03ff9..ae57337386 100644 --- a/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCMasterRights.cpp +++ b/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCMasterRights.cpp @@ -25,7 +25,7 @@ #define CUSTOMACTION_NAME _T("CAGrantBOINCMasterRights") -#define CUSTOMACTION_PROGRESSTITLE _T("Granting the BOINC service user account required privileges") +#define CUSTOMACTION_PROGRESSTITLE _T("Validating BOINC Master's privileges") ///////////////////////////////////////////////////////////////////// diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCProjectRights.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCProjectRights.cpp index 090fc2d79b..f29d82f55a 100644 --- a/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCProjectRights.cpp +++ b/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCProjectRights.cpp @@ -25,7 +25,7 @@ #define CUSTOMACTION_NAME _T("CAGrantBOINCProjectRights") -#define CUSTOMACTION_PROGRESSTITLE _T("Granting the BOINC Project user account required privileges") +#define CUSTOMACTION_PROGRESSTITLE _T("Validating BOINC Project's privileges") ///////////////////////////////////////////////////////////////////// diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCProjectsRights.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCProjectsRights.cpp index cbf1862ae6..07b9522093 100644 --- a/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCProjectsRights.cpp +++ b/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCProjectsRights.cpp @@ -25,7 +25,7 @@ #define CUSTOMACTION_NAME _T("CAGrantBOINCProjectsRights") -#define CUSTOMACTION_PROGRESSTITLE _T("Granting the BOINC Projects required privileges") +#define CUSTOMACTION_PROGRESSTITLE _T("Validating the BOINC Projects group privilege levels") ///////////////////////////////////////////////////////////////////// diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCUsersRights.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCUsersRights.cpp index 7dea2f7e28..c237e3fe5b 100644 --- a/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCUsersRights.cpp +++ b/win_build/installerv2/redist/Windows/src/boinccas/CAGrantBOINCUsersRights.cpp @@ -25,7 +25,7 @@ #define CUSTOMACTION_NAME _T("CAGrantBOINCUsersRights") -#define CUSTOMACTION_PROGRESSTITLE _T("Granting the BOINC Users required privileges") +#define CUSTOMACTION_PROGRESSTITLE _T("Validating the BOINC Users group privilege levels") ///////////////////////////////////////////////////////////////////// diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CAMigrateBOINCData.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CAMigrateBOINCData.cpp index 0439c23fbe..d4ad1de2e2 100644 --- a/win_build/installerv2/redist/Windows/src/boinccas/CAMigrateBOINCData.cpp +++ b/win_build/installerv2/redist/Windows/src/boinccas/CAMigrateBOINCData.cpp @@ -332,10 +332,13 @@ UINT CAMigrateBOINCData::OnExecution() tstring strDestinationClientStateFile; tstring strRemove; tstring strProductVersion; + tstring strWindowsDirectory; + tstring strWindowsSystemDirectory; struct _stat buf; ULONGLONG ullFileSize = 0; ULONGLONG ullDirectorySize = 0; ULONGLONG ullFreeDiskSpace = 0; + TCHAR szBuffer[2048]; UINT uiReturnValue = -1; LogMessage( @@ -401,6 +404,7 @@ UINT CAMigrateBOINCData::OnExecution() BOOL bDataDirExistsWithinInstallDir = (BOOL)(tstring::npos != strFutureDataDirectory.find(strFutureInstallDirectory)); + if ( bClientStateExists ) { // If migration was done with a previous 6.x client then we don't need