summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2019-11-29 13:38:59 +0100
committerDavid Lönnhager <david.l@mullvad.net>2019-11-29 13:38:59 +0100
commit35ce3b4ae4368d9418b5dd017a788f9192c1c97a (patch)
tree4fac77c3aa9e78508daaafe4f4e0f40b4163df9c
parente8ccf55092fad45ca7c63bc97c74e18ece55c5d0 (diff)
parentdd21c2f51d9d32fbeb8d27ed80916cbc7f5545f4 (diff)
downloadmullvadvpn-35ce3b4ae4368d9418b5dd017a788f9192c1c97a.tar.xz
mullvadvpn-35ce3b4ae4368d9418b5dd017a788f9192c1c97a.zip
Merge branch 'win-migration-update'
-rw-r--r--windows/winutil/src/winutil/migration.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/windows/winutil/src/winutil/migration.cpp b/windows/winutil/src/winutil/migration.cpp
index 3dd5653a07..ee9bc8ade0 100644
--- a/windows/winutil/src/winutil/migration.cpp
+++ b/windows/winutil/src/winutil/migration.cpp
@@ -67,9 +67,10 @@ MigrationStatus MigrateAfterWindowsUpdate()
throw std::runtime_error("Could not determine owner of backup directory");
}
- if (FALSE == IsWellKnownSid(sid, WinLocalSystemSid))
+ if (FALSE == IsWellKnownSid(sid, WinLocalSystemSid)
+ && FALSE == IsWellKnownSid(sid, WinBuiltinAdministratorsSid))
{
- throw std::runtime_error("Backup directory is not owned by SYSTEM");
+ throw std::runtime_error("Backup directory is not owned by SYSTEM or Built-in Administrators");
}
//