rpms/openssh
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Workaround for RHEL 8 incompatibility in scp utility in SFTP mode

Browse Source 
Related: rhbz#2038854
This commit is contained in:
Dmitry Belyavskiy 2022-02-22 13:06:07 +01:00
parent 14950508f7
commit cf05a27ed6
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openssh-8.7p1-recursive-scp.patch
View File

@ -22,7 +22,7 @@ diff -up openssh-8.7p1/sftp-client.c.scp-sftpdirs openssh-8.7p1/sftp-client.c
{ {
struct sshbuf *msg; struct sshbuf *msg;
u_int expected_id, count, id; u_int expected_id, count, id;
@@ -1012,9 +1012,37 @@ do_realpath_expand(struct sftp_conn *con @@ -1012,9 +1012,38 @@ do_realpath_expand(struct sftp_conn *con
if ((r = sshbuf_get_u32(msg, &status)) != 0) if ((r = sshbuf_get_u32(msg, &status)) != 0)
fatal_fr(r, "parse status"); fatal_fr(r, "parse status");
@ -30,6 +30,7 @@ diff -up openssh-8.7p1/sftp-client.c.scp-sftpdirs openssh-8.7p1/sftp-client.c
- sshbuf_free(msg); - sshbuf_free(msg);
- return NULL; - return NULL;
+ if ((status == SSH2_FX_NO_SUCH_FILE) && create_dir) { + if ((status == SSH2_FX_NO_SUCH_FILE) && create_dir) {
+ memset(&a, '\0', sizeof(a));
+ if ((r = do_mkdir(conn, path, &a, 0)) != 0) { + if ((r = do_mkdir(conn, path, &a, 0)) != 0) {
+ sshbuf_free(msg); + sshbuf_free(msg);
+ return NULL; + return NULL;

6
openssh.spec
View File

@ -51,7 +51,7 @@
# Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
%global openssh_ver 8.7p1 %global openssh_ver 8.7p1
%global openssh_rel 7 %global openssh_rel 8
%global pam_ssh_agent_ver 0.10.4 %global pam_ssh_agent_ver 0.10.4
%global pam_ssh_agent_rel 4 %global pam_ssh_agent_rel 4
@ -681,6 +681,10 @@ test -f %{sysconfig_anaconda} && \
%endif %endif
%changelog %changelog
* Mon Feb 21 2022 Dmitry Belyavskiy <dbelyavs@redhat.com> - 8.7p1-8
- Workaround for RHEL 8 incompatibility in scp utility in SFTP mode
Related: rhbz#2038854
* Mon Feb 07 2022 Dmitry Belyavskiy <dbelyavs@redhat.com> - 8.7p1-7 * Mon Feb 07 2022 Dmitry Belyavskiy <dbelyavs@redhat.com> - 8.7p1-7
- Switch to SFTP protocol in scp utility by default - upstream fixes - Switch to SFTP protocol in scp utility by default - upstream fixes
Related: rhbz#2001002 Related: rhbz#2001002