diff options
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/debian-config.patch | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch index 7a78e5765..cfa6ef6b7 100644 --- a/debian/patches/debian-config.patch +++ b/debian/patches/debian-config.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c975d37df187e00832d6b6070731b8a8c16a6f56 Mon Sep 17 00:00:00 2001 | 1 | From 9351b179c72f18dc1b1d5bb84b2a7dab5e0af3fc Mon Sep 17 00:00:00 2001 |
2 | From: Colin Watson <cjwatson@debian.org> | 2 | From: Colin Watson <cjwatson@debian.org> |
3 | Date: Sun, 9 Feb 2014 16:10:18 +0000 | 3 | Date: Sun, 9 Feb 2014 16:10:18 +0000 |
4 | Subject: Various Debian-specific configuration changes | 4 | Subject: Various Debian-specific configuration changes |
@@ -19,7 +19,7 @@ debian/openssh-server.postinst. | |||
19 | 19 | ||
20 | Author: Russ Allbery <rra@debian.org> | 20 | Author: Russ Allbery <rra@debian.org> |
21 | Forwarded: not-needed | 21 | Forwarded: not-needed |
22 | Last-Update: 2015-11-29 | 22 | Last-Update: 2015-12-07 |
23 | 23 | ||
24 | Patch-Name: debian-config.patch | 24 | Patch-Name: debian-config.patch |
25 | --- | 25 | --- |
@@ -27,8 +27,9 @@ Patch-Name: debian-config.patch | |||
27 | ssh.1 | 21 +++++++++++++++++++++ | 27 | ssh.1 | 21 +++++++++++++++++++++ |
28 | ssh_config | 7 ++++++- | 28 | ssh_config | 7 ++++++- |
29 | ssh_config.5 | 19 ++++++++++++++++++- | 29 | ssh_config.5 | 19 ++++++++++++++++++- |
30 | sshd_config | 2 +- | ||
30 | sshd_config.5 | 25 +++++++++++++++++++++++++ | 31 | sshd_config.5 | 25 +++++++++++++++++++++++++ |
31 | 5 files changed, 71 insertions(+), 3 deletions(-) | 32 | 6 files changed, 72 insertions(+), 4 deletions(-) |
32 | 33 | ||
33 | diff --git a/readconf.c b/readconf.c | 34 | diff --git a/readconf.c b/readconf.c |
34 | index c0ba5a7..e4e1cba 100644 | 35 | index c0ba5a7..e4e1cba 100644 |
@@ -143,6 +144,19 @@ index d4928b8..81b9b74 100644 | |||
143 | .Pp | 144 | .Pp |
144 | See the X11 SECURITY extension specification for full details on | 145 | See the X11 SECURITY extension specification for full details on |
145 | the restrictions imposed on untrusted clients. | 146 | the restrictions imposed on untrusted clients. |
147 | diff --git a/sshd_config b/sshd_config | ||
148 | index 64786c9..d8338db 100644 | ||
149 | --- a/sshd_config | ||
150 | +++ b/sshd_config | ||
151 | @@ -125,7 +125,7 @@ UsePrivilegeSeparation sandbox # Default for new installations. | ||
152 | #Banner none | ||
153 | |||
154 | # override default of no subsystems | ||
155 | -Subsystem sftp /usr/libexec/sftp-server | ||
156 | +Subsystem sftp /usr/lib/openssh/sftp-server | ||
157 | |||
158 | # Example of overriding settings on a per-user basis | ||
159 | #Match User anoncvs | ||
146 | diff --git a/sshd_config.5 b/sshd_config.5 | 160 | diff --git a/sshd_config.5 b/sshd_config.5 |
147 | index 0828592..0be7250 100644 | 161 | index 0828592..0be7250 100644 |
148 | --- a/sshd_config.5 | 162 | --- a/sshd_config.5 |