multiple fixes (#132)

PowerShell/Win32-OpenSSH#715
PowerShell/Win32-OpenSSH#714
This commit is contained in:
bagajjal 2017-05-09 14:08:22 -07:00 committed by Manoj Ampalam
parent 7d929c2954
commit 0fe590b192
3 changed files with 4 additions and 3 deletions

View File

@ -173,7 +173,8 @@ function Publish-Artifact
[System.Collections.ArrayList] $artifacts = [System.Collections.ArrayList]::new()
# Get the build.log file for each build configuration
Add-BuildLog -artifacts $artifacts -buildLog (Get-BuildLogFile -root $repoRoot.FullName)
Add-BuildLog -artifacts $artifacts -buildLog (Get-BuildLogFile -root $repoRoot.FullName -Configuration Release -NativeHostArch x64)
Add-BuildLog -artifacts $artifacts -buildLog (Get-BuildLogFile -root $repoRoot.FullName -Configuration Debug -NativeHostArch x86)
if($Global:OpenSSHTestInfo)
{

View File

@ -293,7 +293,7 @@
<ClInclude Include="$(OpenSSH-Src-Path)crypto-wrap.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include=$(OpenSSH-Src-Path)sshfileperm.h">
<ClInclude Include="$(OpenSSH-Src-Path)sshfileperm.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>

View File

@ -134,7 +134,7 @@ check_secure_file_permission(const char *name, struct passwd * pw)
case ACCESS_DENIED_ACE_TYPE: {
PACCESS_DENIED_ACE pDeniedAce = (PACCESS_DENIED_ACE)current_ace;
current_trustee_sid = &(pDeniedAce->SidStart);
if(pDeniedAce->Mask & (FILE_GENERIC_READ & ~(SYNCHRONIZE | READ_CONTROL)) != 0) {
if((pDeniedAce->Mask & (FILE_GENERIC_READ & ~(SYNCHRONIZE | READ_CONTROL))) != 0) {
if (EqualSid(current_trustee_sid, owner_sid)){
debug3("Bad permission on %s. The owner of the file should at least have read permission.", name);
ret = -1;