tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'latestw_all' into merge-9.4

Browse Source
This commit is contained in:
tgauth@bu.edu 2023-08-31 14:22:13 -04:00
commit 7023264b09
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/win32/openssh/paths.targets
View File

@ -5,7 +5,7 @@
<OpenSSH-Bin-Path>$(SolutionDir)..\..\..\bin\</OpenSSH-Bin-Path> <OpenSSH-Bin-Path>$(SolutionDir)..\..\..\bin\</OpenSSH-Bin-Path>
<OpenSSH-Lib-Path>$(SolutionDir)lib\</OpenSSH-Lib-Path> <OpenSSH-Lib-Path>$(SolutionDir)lib\</OpenSSH-Lib-Path>
<LibreSSLVersion>3.7.2.0</LibreSSLVersion> <LibreSSLVersion>3.7.2.0</LibreSSLVersion>
<ZLibVersion>1.2.13</ZLibVersion> <ZLibVersion>1.3</ZLibVersion>
<fido2Version>1.13.0</fido2Version> <fido2Version>1.13.0</fido2Version>
<!--libcbor version is not used in the build; it is needed for pipeline compliance tasks--> <!--libcbor version is not used in the build; it is needed for pipeline compliance tasks-->
<libcborVersion>0.10.1</libcborVersion> <libcborVersion>0.10.1</libcborVersion>

2
contrib/win32/win32compat/w32fd.c
View File

@ -1047,7 +1047,7 @@ char * build_commandline_string(const char* cmd, char *const argv[], BOOLEAN pre
* spawned child will run as as_user if its not NULL * spawned child will run as as_user if its not NULL
*/ */
static int static int
spawn_child_internal(const char* cmd, char *const argv[], HANDLE in, HANDLE out, HANDLE err, unsigned long flags, HANDLE* as_user, BOOLEAN prepend_module_path) spawn_child_internal(const char* cmd, char *const argv[], HANDLE in, HANDLE out, HANDLE err, unsigned long flags, HANDLE as_user, BOOLEAN prepend_module_path)
{ {
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
STARTUPINFOW si; STARTUPINFOW si;