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, 3 insertions, 3 deletions

diff --git a/debian/patches/dnssec-sshfp.patch b/debian/patches/dnssec-sshfp.patch
index 0ba825f4e..6c2ebf173 100644
--- a/debian/patches/dnssec-sshfp.patch
+++ b/debian/patches/dnssec-sshfp.patch
@@ -18,7 +18,7 @@ Patch-Name: dnssec-sshfp.patch
  3 files changed, 21 insertions(+), 6 deletions(-)
 
 diff --git a/dns.c b/dns.c
-index ff1a2c41..82ec9719 100644
+index ff1a2c41c..82ec97199 100644
 --- a/dns.c
 +++ b/dns.c
 @@ -211,6 +211,7 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
@@ -51,7 +51,7 @@ index ff1a2c41..82ec9719 100644
                 verbose("DNS lookup error: %s", dns_result_totext(result));
                 return -1;
 diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
-index dc6fe053..e061a290 100644
+index dc6fe0533..e061a290a 100644
 --- a/openbsd-compat/getrrsetbyname.c
 +++ b/openbsd-compat/getrrsetbyname.c
 @@ -209,8 +209,8 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
@@ -79,7 +79,7 @@ index dc6fe053..e061a290 100644
  
         /* make query */
 diff --git a/openbsd-compat/getrrsetbyname.h b/openbsd-compat/getrrsetbyname.h
-index 1283f550..dbbc85a2 100644
+index 1283f5506..dbbc85a2a 100644
 --- a/openbsd-compat/getrrsetbyname.h
 +++ b/openbsd-compat/getrrsetbyname.h
 @@ -72,6 +72,9 @@