Skip to content

Commit e85070d

Browse files
committed
Source snapshot from Powershell/openssh-portable:latestw_cwb
1 parent a4b577b commit e85070d

31 files changed

+693
-333
lines changed

INSTALL

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
1. Prerequisites
12
----------------
23

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

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

234-
for each of the types you wish to generate (rsa, dsa or ecdsaa) or
235+
for each of the types you wish to generate (rsa, dsa or ecdsa) or
235236

236237
ssh-keygen -A
237238

appveyor.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ init:
1111

1212
build_script:
1313
- ps: |
14-
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1
14+
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1 -WarningAction SilentlyContinue
1515
Invoke-AppVeyorBuild
1616
1717
after_build:
1818
- ps: |
19-
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1
19+
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1 -WarningAction SilentlyContinue
2020
Install-OpenSSH
2121
- ps: Write-Verbose "Restart computer ..."
2222
- ps: Restart-Computer -ComputerName localhost -Force
@@ -25,19 +25,19 @@ after_build:
2525

2626
before_test:
2727
- ps: |
28-
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1
29-
Install-TestDependencies
28+
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1 -WarningAction SilentlyContinue
29+
Install-TestDependencies
3030
3131
test_script:
3232
- cmd: |
33-
"%ProgramFiles%\PowerShell\6.0.0.12\powershell.exe" -Command "Import-Module \"%APPVEYOR_BUILD_FOLDER%\contrib\win32\openssh\AppVeyor.psm1\";Run-OpenSSHTests"
33+
"%ProgramFiles%\PowerShell\6.0.0.14\powershell.exe" -Command "Import-Module \"%APPVEYOR_BUILD_FOLDER%\contrib\win32\openssh\AppVeyor.psm1\" -WarningAction SilentlyContinue;Run-OpenSSHTests"
3434
3535
after_test:
3636
- ps: |
37-
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1
37+
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1 -WarningAction SilentlyContinue
3838
Upload-OpenSSHTestResults
3939
4040
on_finish:
4141
- ps: |
42-
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1
42+
Import-Module $env:APPVEYOR_BUILD_FOLDER\contrib\win32\openssh\AppVeyor.psm1 -WarningAction SilentlyContinue
4343
Publish-Artifact

auth2-pubkey.c

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: auth2-pubkey.c,v 1.60 2016/11/30 02:57:40 djm Exp $ */
1+
/* $OpenBSD: auth2-pubkey.c,v 1.61 2016/12/30 22:08:02 djm Exp $ */
22
/*
33
* Copyright (c) 2000 Markus Friedl. All rights reserved.
44
*
@@ -783,6 +783,9 @@ match_principals_command(struct passwd *user_pw, const struct sshkey *key)
783783

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

786+
fclose(f);
787+
f = NULL;
788+
786789
if (exited_cleanly(pid, "AuthorizedPrincipalsCommand", command) != 0)
787790
goto out;
788791

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

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

1112+
fclose(f);
1113+
f = NULL;
1114+
11091115
if (exited_cleanly(pid, "AuthorizedKeysCommand", command) != 0)
11101116
goto out;
11111117

0 commit comments

Comments
 (0)