Skip to content

Commit

Permalink
Source snapshot from Powershell/openssh-portable:latestw_cwb
Browse files Browse the repository at this point in the history
  • Loading branch information
manojampalam committed Jan 16, 2017
1 parent a4b577b commit e85070d
Show file tree
Hide file tree
Showing 31 changed files with 693 additions and 333 deletions.
3 changes: 2 additions & 1 deletion INSTALL
@@ -1,3 +1,4 @@
1. Prerequisites
----------------

A C compiler. Any C89 or better compiler should work. Where supported,
Expand Down Expand Up @@ -231,7 +232,7 @@ manually using the following commands:

ssh-keygen -t [type] -f /etc/ssh/ssh_host_key -N ""

for each of the types you wish to generate (rsa, dsa or ecdsaa) or
for each of the types you wish to generate (rsa, dsa or ecdsa) or

ssh-keygen -A

Expand Down
14 changes: 7 additions & 7 deletions appveyor.yml
Expand Up @@ -11,12 +11,12 @@ init:

build_script:
- ps: |
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1 -WarningAction SilentlyContinue
Invoke-AppVeyorBuild
after_build:
- ps: |
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1 -WarningAction SilentlyContinue
Install-OpenSSH
- ps: Write-Verbose "Restart computer ..."
- ps: Restart-Computer -ComputerName localhost -Force
Expand All @@ -25,19 +25,19 @@ after_build:

before_test:
- ps: |
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1
Install-TestDependencies
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1 -WarningAction SilentlyContinue
Install-TestDependencies
test_script:
- cmd: |
"%ProgramFiles%\PowerShell\6.0.0.12\powershell.exe" -Command "Import-Module \"%APPVEYOR_BUILD_FOLDER%\contrib\win32\openssh\AppVeyor.psm1\";Run-OpenSSHTests"
"%ProgramFiles%\PowerShell\6.0.0.14\powershell.exe" -Command "Import-Module \"%APPVEYOR_BUILD_FOLDER%\contrib\win32\openssh\AppVeyor.psm1\" -WarningAction SilentlyContinue;Run-OpenSSHTests"
after_test:
- ps: |
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1 -WarningAction SilentlyContinue
Upload-OpenSSHTestResults
on_finish:
- ps: |
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1 -WarningAction SilentlyContinue
Publish-Artifact
8 changes: 7 additions & 1 deletion auth2-pubkey.c
@@ -1,4 +1,4 @@
/* $OpenBSD: auth2-pubkey.c,v 1.60 2016/11/30 02:57:40 djm Exp $ */
/* $OpenBSD: auth2-pubkey.c,v 1.61 2016/12/30 22:08:02 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
Expand Down Expand Up @@ -783,6 +783,9 @@ match_principals_command(struct passwd *user_pw, const struct sshkey *key)

ok = process_principals(f, NULL, pw, cert);

fclose(f);
f = NULL;

if (exited_cleanly(pid, "AuthorizedPrincipalsCommand", command) != 0)
goto out;

Expand Down Expand Up @@ -1106,6 +1109,9 @@ user_key_command_allowed2(struct passwd *user_pw, Key *key)

ok = check_authkeys_file(f, options.authorized_keys_command, key, pw);

fclose(f);
f = NULL;

if (exited_cleanly(pid, "AuthorizedKeysCommand", command) != 0)
goto out;

Expand Down

0 comments on commit e85070d

Please sign in to comment.