multiple fixes (#132)

PowerShell/Win32-OpenSSH#715 PowerShell/Win32-OpenSSH#714
PowerShell · May 9, 2017 · 0fe590b · 0fe590b
1 parent 7d929c2
commit 0fe590b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/contrib/win32/openssh/AppveyorHelper.psm1 b/contrib/win32/openssh/AppveyorHelper.psm1
@@ -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)
     {

diff --git a/contrib/win32/openssh/libssh.vcxproj.filters b/contrib/win32/openssh/libssh.vcxproj.filters
@@ -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>

diff --git a/contrib/win32/win32compat/w32-sshfileperm.c b/contrib/win32/win32compat/w32-sshfileperm.c
@@ -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;