From fb6200a30dbc54f249f26d67eb5c7584fe51c468 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 27 Nov 2019 11:17:35 +0100 Subject: conf: migrate when windows.old is S-1-5-32-544 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported-by: Mantas Mikulėnas --- conf/migration_windows.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/migration_windows.go b/conf/migration_windows.go index fb12eaf0..72b298b6 100644 --- a/conf/migration_windows.go +++ b/conf/migration_windows.go @@ -36,8 +36,8 @@ func maybeMigrate(c string) { log.Printf("Not migrating configuration from ‘%s’ due to GetSecurityDescriptorOwner error: %v", oldRoot, err) return } - if defaulted || !owner.IsWellKnown(windows.WinLocalSystemSid) { - log.Printf("Not migrating configuration from ‘%s’, as it is not explicitly owned by SYSTEM, but rather ‘%v’", oldRoot, owner) + if defaulted || (!owner.IsWellKnown(windows.WinLocalSystemSid) && !owner.IsWellKnown(windows.WinBuiltinAdministratorsSid)) { + log.Printf("Not migrating configuration from ‘%s’, as it is not explicitly owned by SYSTEM or Built-in Administrators, but rather ‘%v’", oldRoot, owner) return } err = windows.MoveFileEx(windows.StringToUTF16Ptr(oldC), windows.StringToUTF16Ptr(c), windows.MOVEFILE_COPY_ALLOWED) -- cgit v1.2.3-59-g8ed1b