4 files changed, 21 insertions, 6 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 85a70696c..6e9785902 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-c975d37df187e00832d6b6070731b8a8c16a6f56
-c975d37df187e00832d6b6070731b8a8c16a6f56
+9351b179c72f18dc1b1d5bb84b2a7dab5e0af3fc
+9351b179c72f18dc1b1d5bb84b2a7dab5e0af3fc
 651211fd4a199b299540c00c54a46e27fadb04be
 651211fd4a199b299540c00c54a46e27fadb04be
 openssh_7.1p1.orig.tar.gz
diff --git a/debian/changelog b/debian/changelog
index bbade1fb8..c5fb66328 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ openssh (1:7.1p1-2) UNRELEASED; urgency=medium
     (closes: #806962).
   * Add an openssh-client-ssh1 binary package for people who need to connect
     to outdated SSH1-only servers (closes: #807107).
+  * Update "Subsystem sftp" path in example sshd_config (closes: #691004).
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 03 Dec 2015 11:59:32 +0000
 
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 @@
-From c975d37df187e00832d6b6070731b8a8c16a6f56 Mon Sep 17 00:00:00 2001
+From 9351b179c72f18dc1b1d5bb84b2a7dab5e0af3fc 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
@@ -19,7 +19,7 @@ debian/openssh-server.postinst.
 
 Author: Russ Allbery <rra@debian.org>
 Forwarded: not-needed
-Last-Update: 2015-11-29
+Last-Update: 2015-12-07
 
 Patch-Name: debian-config.patch
 ---
@@ -27,8 +27,9 @@ Patch-Name: debian-config.patch
  ssh.1         | 21 +++++++++++++++++++++
  ssh_config    |  7 ++++++-
  ssh_config.5  | 19 ++++++++++++++++++-
+ sshd_config   |  2 +-
  sshd_config.5 | 25 +++++++++++++++++++++++++
- 5 files changed, 71 insertions(+), 3 deletions(-)
+ 6 files changed, 72 insertions(+), 4 deletions(-)
 
 diff --git a/readconf.c b/readconf.c
 index c0ba5a7..e4e1cba 100644
@@ -143,6 +144,19 @@ index d4928b8..81b9b74 100644
  .Pp
  See the X11 SECURITY extension specification for full details on
  the restrictions imposed on untrusted clients.
+diff --git a/sshd_config b/sshd_config
+index 64786c9..d8338db 100644
+--- a/sshd_config
++++ b/sshd_config
+@@ -125,7 +125,7 @@ UsePrivilegeSeparation sandbox              # Default for new installations.
+ #Banner none
+ 
+ # override default of no subsystems
+-Subsystem      sftp    /usr/libexec/sftp-server
++Subsystem      sftp    /usr/lib/openssh/sftp-server
+ 
+ # Example of overriding settings on a per-user basis
+ #Match User anoncvs
 diff --git a/sshd_config.5 b/sshd_config.5
 index 0828592..0be7250 100644
 --- a/sshd_config.5
diff --git a/sshd_config b/sshd_config
index 64786c935..d8338dbd2 100644
--- a/sshd_config
+++ b/sshd_config
@@ -125,7 +125,7 @@ UsePrivilegeSeparation sandbox		# Default for new installations.
 #Banner none
 
 # override default of no subsystems
-Subsystem       sftp    /usr/libexec/sftp-server
+Subsystem       sftp    /usr/lib/openssh/sftp-server
 
 # Example of overriding settings on a per-user basis
 #Match User anoncvs