[ Christian Ehrhardt ]

Fix unintentional restriction of authorized keys environment options
to be alphanumeric (LP: #1771011)

1 files changed, 8 insertions, 8 deletions

diff --git a/debian/patches/user-group-modes.patch b/debian/patches/user-group-modes.patch
index a7201b318..712620843 100644
--- a/debian/patches/user-group-modes.patch
+++ b/debian/patches/user-group-modes.patch
@@ -19,7 +19,7 @@ Patch-Name: user-group-modes.patch
 ---
  auth-rhosts.c |  6 ++----
  auth.c        |  3 +--
- misc.c        | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
+ misc.c        | 58 ++++++++++++++++++++++++++++++++++++++++++++++-----
  misc.h        |  2 ++
  readconf.c    |  3 +--
  ssh.1         |  2 ++
@@ -27,7 +27,7 @@ Patch-Name: user-group-modes.patch
  7 files changed, 63 insertions(+), 13 deletions(-)
 
 diff --git a/auth-rhosts.c b/auth-rhosts.c
-index ecf956f0..4dccd5e6 100644
+index ecf956f06..4dccd5e6a 100644
 --- a/auth-rhosts.c
 +++ b/auth-rhosts.c
 @@ -261,8 +261,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
@@ -51,7 +51,7 @@ index ecf956f0..4dccd5e6 100644
                             pw->pw_name, buf);
                         auth_debug_add("Bad file modes for %.200s", buf);
 diff --git a/auth.c b/auth.c
-index 76d586e3..68b9fe79 100644
+index 76d586e31..68b9fe795 100644
 --- a/auth.c
 +++ b/auth.c
 @@ -468,8 +468,7 @@ check_key_in_hostfiles(struct passwd *pw, struct sshkey *key, const char *host,
@@ -65,7 +65,7 @@ index 76d586e3..68b9fe79 100644
                             "bad owner or modes for %.200s",
                             pw->pw_name, user_hostfile);
 diff --git a/misc.c b/misc.c
-index 874dcc8a..75c4113f 100644
+index 874dcc8a2..75c4113f0 100644
 --- a/misc.c
 +++ b/misc.c
 @@ -57,8 +57,9 @@
@@ -156,7 +156,7 @@ index 874dcc8a..75c4113f 100644
                             "bad ownership or modes for directory %s", buf);
                         return -1;
 diff --git a/misc.h b/misc.h
-index cdafea73..51943db9 100644
+index cdafea735..51943db90 100644
 --- a/misc.h
 +++ b/misc.h
 @@ -168,6 +168,8 @@ char        *read_passphrase(const char *, int);
@@ -169,7 +169,7 @@ index cdafea73..51943db9 100644
  #define MAXIMUM(a, b)  (((a) > (b)) ? (a) : (b))
  #define ROUNDUP(x, y)   ((((x)+((y)-1))/(y))*(y))
 diff --git a/readconf.c b/readconf.c
-index 7f2b5c17..50349e23 100644
+index 7f2b5c172..50349e238 100644
 --- a/readconf.c
 +++ b/readconf.c
 @@ -1741,8 +1741,7 @@ read_config_file_depth(const char *filename, struct passwd *pw,
@@ -183,7 +183,7 @@ index 7f2b5c17..50349e23 100644
         }
  
 diff --git a/ssh.1 b/ssh.1
-index b4078525..0ef7c170 100644
+index b4078525b..0ef7c1709 100644
 --- a/ssh.1
 +++ b/ssh.1
 @@ -1471,6 +1471,8 @@ The file format and configuration options are described in
@@ -196,7 +196,7 @@ index b4078525..0ef7c170 100644
  .It Pa ~/.ssh/environment
  Contains additional definitions for environment variables; see
 diff --git a/ssh_config.5 b/ssh_config.5
-index 32c3632c..84dcd52c 100644
+index 32c3632c7..84dcd52cc 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -1818,6 +1818,8 @@ The format of this file is described above.