diff options
| author | Sebastiaan van Stijn <github@gone.nl> | 2020-03-09 12:42:08 +0100 |
|---|---|---|
| committer | Sebastiaan van Stijn <github@gone.nl> | 2020-03-09 12:43:02 +0100 |
| commit | 70a4d886cdcd57f7259cda667a7fa97c3e2d0b7e (patch) | |
| tree | 73ce61aebdb0a0701725c03f50dd2b20f29dde07 /builder/dockerfile | |
| parent | 3bba43b894c850f0914c778aec0a41fbccbc74b6 (diff) | |
| download | docker-70a4d886cdcd57f7259cda667a7fa97c3e2d0b7e.tar.gz | |
builder: fixPermissionsWindows(): use golang.org/x/sys/windows
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to 'builder/dockerfile')
| -rw-r--r-- | builder/dockerfile/copy_windows.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/builder/dockerfile/copy_windows.go b/builder/dockerfile/copy_windows.go index b7475187fe..3f0ea32426 100644 --- a/builder/dockerfile/copy_windows.go +++ b/builder/dockerfile/copy_windows.go @@ -67,21 +67,17 @@ func fixPermissionsWindows(source, destination, SID string) error { sddlString := system.SddlAdministratorsLocalSystem sddlString += "(A;OICI;GRGWGXRCWDSD;;;" + SID + ")" - securityDescriptor, err := winio.SddlToSecurityDescriptor(sddlString) + securityDescriptor, err := windows.SecurityDescriptorFromString(sddlString) if err != nil { return err } - var daclPresent uint32 - var daclDefaulted uint32 - var dacl *byte - - err = system.GetSecurityDescriptorDacl(&securityDescriptor[0], &daclPresent, &dacl, &daclDefaulted) + dacl, _, err := securityDescriptor.DACL() if err != nil { return err } - return system.SetNamedSecurityInfo(windows.StringToUTF16Ptr(destination), windows.SE_FILE_OBJECT, windows.OWNER_SECURITY_INFORMATION|windows.DACL_SECURITY_INFORMATION, sid, nil, dacl, nil) + return windows.SetNamedSecurityInfo(destination, windows.SE_FILE_OBJECT, windows.OWNER_SECURITY_INFORMATION|windows.DACL_SECURITY_INFORMATION, sid, nil, dacl, nil) } func validateCopySourcePath(imageSource *imageMount, origPath, platform string) error { |