fixup! OpenSSH 8.7p1 patches rebase

This commit is contained in:
Dmitry Belyavskiy 2021-09-16 16:13:20 +02:00
parent 640f2450c4
commit 72aea69dd8

View File

@ -5,7 +5,7 @@ diff -up openssh-8.7p1/pathnames.h.kill-scp openssh-8.7p1/pathnames.h
#define _PATH_HOST_XMSS_KEY_FILE SSHDIR "/ssh_host_xmss_key"
#define _PATH_HOST_RSA_KEY_FILE SSHDIR "/ssh_host_rsa_key"
#define _PATH_DH_MODULI SSHDIR "/moduli"
+#define _PATH_SCP_KILL_SWITCH SSHDIR "/scp_kill_switch"
+#define _PATH_SCP_KILL_SWITCH SSHDIR "/disable_scp"
#ifndef _PATH_SSH_PROGRAM
#define _PATH_SSH_PROGRAM "/usr/bin/ssh"
@ -18,7 +18,7 @@ diff -up openssh-8.7p1/scp.1.kill-scp openssh-8.7p1/scp.1
.El
+.Pp
+Usage of SCP protocol can be blocked by creating a world-readable
+.Ar /etc/ssh/scp_kill_switch
+.Ar /etc/ssh/disable_scp
+file. If this file exists, when SCP protocol is in use (either remotely or
+via the
+.Fl O