diff options
author | marha <marha@users.sourceforge.net> | 2014-05-18 14:43:25 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-05-18 14:43:25 +0200 |
commit | a27ca45b676116ebbce31973bc1a319cad76ffbf (patch) | |
tree | 098711ced704936739bc91abbd75942a815d89db /tools | |
parent | 0b89941658d6117d17555ee28c6e5d7715673705 (diff) | |
parent | 55cf29d7f748b814a2b8eb016fbf15635d56aa53 (diff) | |
download | vcxsrv-a27ca45b676116ebbce31973bc1a319cad76ffbf.tar.gz vcxsrv-a27ca45b676116ebbce31973bc1a319cad76ffbf.tar.bz2 vcxsrv-a27ca45b676116ebbce31973bc1a319cad76ffbf.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/builtin_functions.cpp
Diffstat (limited to 'tools')
-rw-r--r-- | tools/plink/winsecur.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/plink/winsecur.c b/tools/plink/winsecur.c index d04e88a92..df93a74c5 100644 --- a/tools/plink/winsecur.c +++ b/tools/plink/winsecur.c @@ -187,6 +187,12 @@ int make_private_security_descriptor(DWORD permissions, goto cleanup; } + if (!SetSecurityDescriptorOwner(*psd, usersid, FALSE)) { + *error = dupprintf("unable to set owner in security descriptor: %s", + win_strerror(GetLastError())); + goto cleanup; + } + if (!SetSecurityDescriptorDacl(*psd, TRUE, *acl, FALSE)) { *error = dupprintf("unable to set DACL in security descriptor: %s", win_strerror(GetLastError())); |