tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-29 16:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix build errors

Browse Source
This commit is contained in:
Tess Gauthier 2023-02-03 12:34:37 -05:00
parent 1035101322
commit d662cc9f7e
4 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/win32/openssh/unittest-kex.vcxproj
View File

@ -423,6 +423,7 @@
<ExcludedFromBuild Condition="$(UseOpenSSL)=='false'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="$(UseOpenSSL)=='false'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="$(OpenSSH-Src-Path)ssh-sk-client.c" /> <ClCompile Include="$(OpenSSH-Src-Path)ssh-sk-client.c" />
<ClCompile Include="..\..\..\regress\unittests\kex\test_proposal.c" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

1
contrib/win32/openssh/unittest-misc.vcxproj
View File

@ -429,6 +429,7 @@
<ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\wmain_common.c"> <ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\wmain_common.c">
<ExcludedFromBuild Condition="$(UseOpenSSL)==false">true</ExcludedFromBuild> <ExcludedFromBuild Condition="$(UseOpenSSL)==false">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\regress\unittests\misc\test_ptimeout.c" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

10
scp.c
View File

@ -391,6 +391,15 @@ do_cmd(char *program, char *host, char *remuser, int port, int subsystem,
} }
freeargs(&args_dup); freeargs(&args_dup);
/* Parent. Close the other side, and return the local side. */
close(pin[0]);
close(pout[1]);
*fdout = pin[1];
*fdin = pout[0];
ssh_signal(SIGTERM, killchild);
ssh_signal(SIGINT, killchild);
ssh_signal(SIGHUP, killchild);
return 0;
#else #else
*pid = fork(); *pid = fork();
switch (*pid) { switch (*pid) {
@ -452,6 +461,7 @@ do_cmd(char *program, char *host, char *remuser, int port, int subsystem,
ssh_signal(SIGHUP, killchild); ssh_signal(SIGHUP, killchild);
return 0; return 0;
} }
#endif
} }
/* /*

15
sshd.c
View File

@ -1350,6 +1350,7 @@ send_rexec_state(int fd, struct sshbuf *conf)
if ((r = sshbuf_put_stringb(m, conf)) != 0 || if ((r = sshbuf_put_stringb(m, conf)) != 0 ||
(r = sshbuf_put_stringb(m, inc)) != 0) (r = sshbuf_put_stringb(m, inc)) != 0)
fatal_fr(r, "compose config"); fatal_fr(r, "compose config");
if (ssh_msg_send(fd, 0, m) == -1) if (ssh_msg_send(fd, 0, m) == -1)
error_f("ssh_msg_send failed"); error_f("ssh_msg_send failed");
@ -2020,7 +2021,7 @@ main(int ac, char **av)
/* Parse command-line arguments. */ /* Parse command-line arguments. */
while ((opt = getopt(ac, av, while ((opt = getopt(ac, av,
"C:E:b:c:f:g:h:k:o:p:u:46DQRTdeiqrtV")) != -1) { "C:E:b:c:f:g:h:k:o:p:u:46DQRTdeiqrtVyz")) != -1) {
switch (opt) { switch (opt) {
case '4': case '4':
options.address_family = AF_INET; options.address_family = AF_INET;
@ -2125,6 +2126,18 @@ main(int ac, char **av)
fprintf(stderr, "%s, %s\n", fprintf(stderr, "%s, %s\n",
SSH_VERSION, SSH_OPENSSL_VERSION); SSH_VERSION, SSH_OPENSSL_VERSION);
exit(0); exit(0);
case 'y':
privsep_unauth_child = 1;
rexec_flag = 0;
logfile = NULL;
//Sleep(10 * 1000);
break;
case 'z':
privsep_auth_child = 1;
rexec_flag = 0;
logfile = NULL;
//Sleep(10 * 1000);
break;
default: default:
usage(); usage();
break; break;