Merge branch 'fix-authorized_keys-environment-var' into 'master'

Fix ENV restriction of authorized keys

See merge request ssh-team/openssh!2

1 files changed, 2 insertions, 2 deletions

diff --git a/debian/patches/systemd-readiness.patch b/debian/patches/systemd-readiness.patch
index a0e733f1b..982085c4c 100644
--- a/debian/patches/systemd-readiness.patch
+++ b/debian/patches/systemd-readiness.patch
@@ -14,7 +14,7 @@ Patch-Name: systemd-readiness.patch
  2 files changed, 33 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 3e23e60d..eac143b4 100644
+index 3e23e60d6..eac143b4d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -4496,6 +4496,29 @@ AC_ARG_WITH([kerberos5],
@@ -56,7 +56,7 @@ index 3e23e60d..eac143b4 100644
  echo "           Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
  echo "                  BSD Auth support: $BSD_AUTH_MSG"
 diff --git a/sshd.c b/sshd.c
-index 1d645a17..3a86e66e 100644
+index 1d645a170..3a86e66e7 100644
 --- a/sshd.c
 +++ b/sshd.c
 @@ -85,6 +85,10 @@