diff options
Diffstat (limited to 'debian/patches/debian-config.patch')
| -rw-r--r-- | debian/patches/debian-config.patch | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch index ce3c1c0..2add806 100644 --- a/debian/patches/debian-config.patch +++ b/debian/patches/debian-config.patch @@ -1,4 +1,4 @@ -From 04acdcf452c7a88ac8c37ca6870a571125fbc8da Mon Sep 17 00:00:00 2001 +From 72b01845849043dbf3edde4d0b1a728ff05d8630 Mon Sep 17 00:00:00 2001 From: Colin Watson <cjwatson@debian.org> Date: Sun, 9 Feb 2014 16:10:18 +0000 Subject: Various Debian-specific configuration changes @@ -26,13 +26,15 @@ sshd: Change sftp subsystem path to /usr/lib/openssh/sftp-server. sshd: Include /etc/ssh/sshd_config.d/*.conf. +sshd: Document Debian's default for SshdSessionPath. + regress: Run tests with 'UsePAM yes', to match sshd_config. Document all of this. Author: Russ Allbery <rra@debian.org> Forwarded: not-needed -Last-Update: 2023-01-03 +Last-Update: 2024-07-03 Patch-Name: debian-config.patch --- @@ -42,11 +44,11 @@ Patch-Name: debian-config.patch ssh_config | 8 +++++++- ssh_config.5 | 26 +++++++++++++++++++++++++- sshd_config | 18 ++++++++++++------ - sshd_config.5 | 29 +++++++++++++++++++++++++++++ - 7 files changed, 99 insertions(+), 9 deletions(-) + sshd_config.5 | 31 ++++++++++++++++++++++++++++++- + 7 files changed, 100 insertions(+), 10 deletions(-) diff --git a/readconf.c b/readconf.c -index d68658185..720062bcc 100644 +index eaca29ace..1b64b7af5 100644 --- a/readconf.c +++ b/readconf.c @@ -2739,7 +2739,7 @@ fill_default_options(Options * options) @@ -59,19 +61,19 @@ index d68658185..720062bcc 100644 options->forward_x11_timeout = 1200; /* diff --git a/regress/test-exec.sh b/regress/test-exec.sh -index ad627941f..56e98159c 100644 +index 7afc28072..02b122a85 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh -@@ -609,6 +609,7 @@ cat << EOF > $OBJ/sshd_config - AcceptEnv _XXX_TEST_* - AcceptEnv _XXX_TEST +@@ -622,6 +622,7 @@ cat << EOF > $OBJ/sshd_config Subsystem sftp $SFTPSERVER + SshdSessionPath $SSHD_SESSION + PerSourcePenalties no + UsePAM yes EOF # This may be necessary if /usr/src and/or /usr/obj are group-writable, diff --git a/ssh.1 b/ssh.1 -index 0d56f3dc1..ddfe75b95 100644 +index c8c5558e5..0697ec77d 100644 --- a/ssh.1 +++ b/ssh.1 @@ -861,6 +861,16 @@ directive in @@ -138,7 +140,7 @@ index 16197d15d..92d06ef38 100644 + HashKnownHosts yes + GSSAPIAuthentication yes diff --git a/ssh_config.5 b/ssh_config.5 -index 41d4d7406..c2789a09d 100644 +index cb1bba1a7..091b933b4 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -71,6 +71,29 @@ Since the first obtained value for each parameter is used, more @@ -244,7 +246,7 @@ index ecfe8d026..677f97d5d 100644 # Example of overriding settings on a per-user basis #Match User anoncvs diff --git a/sshd_config.5 b/sshd_config.5 -index 0e8891c4f..12083e839 100644 +index 9d33cb472..1f6c42523 100644 --- a/sshd_config.5 +++ b/sshd_config.5 @@ -56,6 +56,35 @@ Arguments may optionally be enclosed in double quotes @@ -283,3 +285,12 @@ index 0e8891c4f..12083e839 100644 The possible keywords and their meanings are as follows (note that keywords are case-insensitive and arguments are case-sensitive): +@@ -1840,7 +1869,7 @@ Overrides the default path to the + .Cm sshd-session + binary that is invoked to handle each connection. + The default is +-.Pa /usr/libexec/sshd-session . ++.Pa /usr/lib/openssh/sshd-session . + This option is intended for use by tests. + .It Cm StreamLocalBindMask + Sets the octal file creation mode mask |