Include /etc/ssh/*_config.d/*.conf

Include /etc/ssh/ssh_config.d/*.conf from /etc/ssh/ssh_config and
/etc/ssh/sshd_config.d/*.conf from /etc/ssh/sshd_config.

Closes: #845315

1 files changed, 3 insertions, 3 deletions

diff --git a/debian/patches/restore-authorized_keys2.patch b/debian/patches/restore-authorized_keys2.patch
index 7281395ae..aa6f4cc31 100644
--- a/debian/patches/restore-authorized_keys2.patch
+++ b/debian/patches/restore-authorized_keys2.patch
@@ -1,4 +1,4 @@
-From 2fe72c4e855be0fc87dbdc296632394b6cfe957a Mon Sep 17 00:00:00 2001
+From 58390cbd5e07df92729b794beb491f7352b26993 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 5 Mar 2017 02:02:11 +0000
 Subject: Restore reading authorized_keys2 by default
@@ -18,10 +18,10 @@ Patch-Name: restore-authorized_keys2.patch
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/sshd_config b/sshd_config
-index ed8272f6d..ee9629102 100644
+index 459c1b230..dc0db5706 100644
 --- a/sshd_config
 +++ b/sshd_config
-@@ -36,9 +36,8 @@
+@@ -38,9 +38,8 @@ Include /etc/ssh/sshd_config.d/*.conf
  
  #PubkeyAuthentication yes